Changeset 973ef9fc in mainline for uspace/lib/c/generic/io/console.c


Ignore:
Timestamp:
2010-12-25T21:20:28Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/io/console.c

    r1bfd3d3 r973ef9fc  
    4545}
    4646
    47 int console_get_size(int phone, ipcarg_t *cols, ipcarg_t *rows)
     47int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows)
    4848{
    4949        return async_req_0_2(phone, CONSOLE_GET_SIZE, cols, rows);
     
    7171}
    7272
    73 int console_get_color_cap(int phone, ipcarg_t *ccap)
     73int console_get_color_cap(int phone, sysarg_t *ccap)
    7474{
    7575        return async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, ccap);
     
    8181}
    8282
    83 int console_get_pos(int phone, ipcarg_t *col, ipcarg_t *row)
     83int console_get_pos(int phone, sysarg_t *col, sysarg_t *row)
    8484{
    8585        return async_req_0_2(phone, CONSOLE_GET_POS, col, row);
    8686}
    8787
    88 void console_set_pos(int phone, ipcarg_t col, ipcarg_t row)
     88void console_set_pos(int phone, sysarg_t col, sysarg_t row)
    8989{
    9090        async_msg_2(phone, CONSOLE_GOTO, col, row);
     
    9393bool console_get_event(int phone, console_event_t *event)
    9494{
    95         ipcarg_t type;
    96         ipcarg_t key;
    97         ipcarg_t mods;
    98         ipcarg_t c;
     95        sysarg_t type;
     96        sysarg_t key;
     97        sysarg_t mods;
     98        sysarg_t c;
    9999       
    100100        int rc = async_req_0_4(phone, CONSOLE_GET_EVENT, &type, &key, &mods, &c);
Note: See TracChangeset for help on using the changeset viewer.