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

Changeset a9b6bec in mainline for uspace/srv/hid/console/gcons.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/gcons.c

    r37f7cfe ra9b6bec  
    8282
    8383static bool use_gcons = false;
    84 static ipcarg_t xres;
    85 static ipcarg_t yres;
     84static sysarg_t xres;
     85static sysarg_t yres;
    8686
    8787enum butstate {
     
    107107static size_t active_console = 0;
    108108
    109 static ipcarg_t mouse_x = 0;
    110 static ipcarg_t mouse_y= 0;
     109static sysarg_t mouse_x = 0;
     110static sysarg_t mouse_y= 0;
    111111
    112112static bool btn_pressed = false;
    113 static ipcarg_t btn_x = 0;
    114 static ipcarg_t btn_y = 0;
     113static sysarg_t btn_x = 0;
     114static sysarg_t btn_y = 0;
    115115
    116116static void vp_switch(int vp)
     
    120120
    121121/** Create view port */
    122 static int vp_create(ipcarg_t x, ipcarg_t y, ipcarg_t width, ipcarg_t height)
     122static int vp_create(sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height)
    123123{
    124124        return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
     
    137137
    138138/** Transparent putchar */
    139 static void tran_putch(wchar_t ch, ipcarg_t col, ipcarg_t row)
     139static void tran_putch(wchar_t ch, sysarg_t col, sysarg_t row)
    140140{
    141141        async_msg_3(fbphone, FB_PUTCHAR, ch, col, row);
     
    297297}
    298298
    299 static int gcons_find_conbut(ipcarg_t x, ipcarg_t y)
    300 {
    301         ipcarg_t status_start = STATUS_START + (xres - 800) / 2;
     299static int gcons_find_conbut(sysarg_t x, sysarg_t y)
     300{
     301        sysarg_t status_start = STATUS_START + (xres - 800) / 2;
    302302       
    303303        if ((y < STATUS_TOP) || (y >= STATUS_TOP + STATUS_HEIGHT))
     
    313313                return -1;
    314314       
    315         ipcarg_t btn = (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
     315        sysarg_t btn = (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
    316316       
    317317        if (btn < CONSOLE_COUNT)
     
    363363 *
    364364 */
    365 static void draw_pixmap(char *logo, size_t size, ipcarg_t x, ipcarg_t y)
     365static void draw_pixmap(char *logo, size_t size, sysarg_t x, sysarg_t y)
    366366{
    367367        /* Create area */
     
    374374       
    375375        /* Send area */
    376         int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
     376        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
    377377        if (rc)
    378378                goto exit;
     
    436436       
    437437        /* Send area */
    438         int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
     438        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
    439439        if (rc)
    440440                goto exit;
     
    513513       
    514514        /* Create status buttons */
    515         ipcarg_t status_start = STATUS_START + (xres - 800) / 2;
     515        sysarg_t status_start = STATUS_START + (xres - 800) / 2;
    516516        size_t i;
    517517        for (i = 0; i < CONSOLE_COUNT; i++) {
Note: See TracChangeset for help on using the changeset viewer.