Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/srv/hid/console/console.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/console/console.c

    r37f7cfe ra9b6bec  
    7474struct {
    7575        int phone;           /**< Framebuffer phone */
    76         ipcarg_t cols;       /**< Framebuffer columns */
    77         ipcarg_t rows;       /**< Framebuffer rows */
    78         ipcarg_t color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
     76        sysarg_t cols;       /**< Framebuffer columns */
     77        sysarg_t rows;       /**< Framebuffer rows */
     78        sysarg_t color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
    7979} fb_info;
    8080
     
    101101/** Information on row-span yet unsent to FB driver. */
    102102struct {
    103         ipcarg_t col;  /**< Leftmost column of the span. */
    104         ipcarg_t row;  /**< Row where the span lies. */
    105         ipcarg_t cnt;  /**< Width of the span. */
     103        sysarg_t col;  /**< Leftmost column of the span. */
     104        sysarg_t row;  /**< Row where the span lies. */
     105        sysarg_t cnt;  /**< Width of the span. */
    106106} fb_pending;
    107107
     
    119119}
    120120
    121 static void curs_goto(ipcarg_t x, ipcarg_t y)
     121static void curs_goto(sysarg_t x, sysarg_t y)
    122122{
    123123        async_msg_2(fb_info.phone, FB_CURSOR_GOTO, x, y);
     
    180180}
    181181
    182 static int ccap_fb_to_con(ipcarg_t ccap_fb, ipcarg_t *ccap_con)
     182static int ccap_fb_to_con(sysarg_t ccap_fb, sysarg_t *ccap_con)
    183183{
    184184        switch (ccap_fb) {
     
    203203
    204204/** Send an area of screenbuffer to the FB driver. */
    205 static void fb_update_area(console_t *cons, ipcarg_t x0, ipcarg_t y0, ipcarg_t width, ipcarg_t height)
     205static void fb_update_area(console_t *cons, sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height)
    206206{
    207207        if (interbuffer) {
    208                 ipcarg_t x;
    209                 ipcarg_t y;
     208                sysarg_t x;
     209                sysarg_t y;
    210210               
    211211                for (y = 0; y < height; y++) {
     
    237237 *
    238238 */
    239 static void cell_mark_changed(ipcarg_t col, ipcarg_t row)
     239static void cell_mark_changed(sysarg_t col, sysarg_t row)
    240240{
    241241        if (fb_pending.cnt != 0) {
     
    255255
    256256/** Print a character to the active VC with buffering. */
    257 static void fb_putchar(wchar_t c, ipcarg_t col, ipcarg_t row)
     257static void fb_putchar(wchar_t c, sysarg_t col, sysarg_t row)
    258258{
    259259        async_msg_3(fb_info.phone, FB_PUTCHAR, c, col, row);
     
    352352                curs_visibility(false);
    353353               
    354                 ipcarg_t x;
    355                 ipcarg_t y;
     354                sysarg_t x;
     355                sysarg_t y;
    356356                int rc = 0;
    357357               
     
    408408                console_event_t ev;
    409409               
    410                 switch (IPC_GET_METHOD(call)) {
     410                switch (IPC_GET_IMETHOD(call)) {
    411411                case IPC_M_PHONE_HUNGUP:
    412412                        /* TODO: Handle hangup */
     
    451451                int retval;
    452452               
    453                 switch (IPC_GET_METHOD(call)) {
     453                switch (IPC_GET_IMETHOD(call)) {
    454454                case IPC_M_PHONE_HUNGUP:
    455455                        /* TODO: Handle hangup */
     
    584584        ipc_callid_t callid;
    585585        ipc_call_t call;
    586         ipcarg_t arg1;
    587         ipcarg_t arg2;
    588         ipcarg_t arg3;
     586        sysarg_t arg1;
     587        sysarg_t arg2;
     588        sysarg_t arg3;
    589589       
    590590        int rc;
     
    608608                arg3 = 0;
    609609               
    610                 switch (IPC_GET_METHOD(call)) {
     610                switch (IPC_GET_IMETHOD(call)) {
    611611                case IPC_M_PHONE_HUNGUP:
    612612                        cons->refcount--;
     
    726726       
    727727        /* NB: The callback connection is slotted for removal */
    728         ipcarg_t phonehash;
     728        sysarg_t phonehash;
    729729        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
    730730                printf(NAME ": Failed to create callback from input device\n");
Note: See TracChangeset for help on using the changeset viewer.