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

Changeset 5863a95 in mainline for uspace/srv/hid/fb/fb.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

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

    r70e5ad5 r5863a95  
    199199static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
    200200static int rgb_from_style(attr_rgb_t *rgb, int style);
    201 static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
    202     ipcarg_t bg_color, ipcarg_t flags);
    203 
    204 static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
    205     ipcarg_t bg_color, ipcarg_t attr);
     201static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
     202    sysarg_t bg_color, sysarg_t flags);
     203
     204static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
     205    sysarg_t bg_color, sysarg_t attr);
    206206
    207207static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
     
    10721072       
    10731073        static unsigned char *shm = NULL;
    1074         static ipcarg_t shm_id = 0;
     1074        static sysarg_t shm_id = 0;
    10751075        static size_t shm_size;
    10761076       
     
    10831083        unsigned int h;
    10841084       
    1085         switch (IPC_GET_METHOD(*call)) {
     1085        switch (IPC_GET_IMETHOD(*call)) {
    10861086        case IPC_M_SHARE_OUT:
    10871087                /* We accept one area for data interchange */
     
    13601360        int newval;
    13611361       
    1362         switch (IPC_GET_METHOD(*call)) {
     1362        switch (IPC_GET_IMETHOD(*call)) {
    13631363        case FB_ANIM_CREATE:
    13641364                nvp = IPC_GET_ARG1(*call);
     
    14351435                        break;
    14361436                }
    1437                 newval = (IPC_GET_METHOD(*call) == FB_ANIM_START);
     1437                newval = (IPC_GET_IMETHOD(*call) == FB_ANIM_START);
    14381438                if (newval ^ animations[i].enabled) {
    14391439                        animations[i].enabled = newval;
     
    14591459        int i, nvp;
    14601460       
    1461         switch (IPC_GET_METHOD(*call)) {
     1461        switch (IPC_GET_IMETHOD(*call)) {
    14621462        case FB_VP_DRAW_PIXMAP:
    14631463                nvp = IPC_GET_ARG1(*call);
     
    15291529}
    15301530
    1531 static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
    1532     ipcarg_t bg_color, ipcarg_t flags)
     1531static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
     1532    sysarg_t bg_color, sysarg_t flags)
    15331533{
    15341534        fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
     
    15621562}
    15631563
    1564 static int fb_set_style(viewport_t *vport, ipcarg_t style)
     1564static int fb_set_style(viewport_t *vport, sysarg_t style)
    15651565{
    15661566        return rgb_from_style(&vport->attr, (int) style);
    15671567}
    15681568
    1569 static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
    1570     ipcarg_t bg_color, ipcarg_t flags)
     1569static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
     1570    sysarg_t bg_color, sysarg_t flags)
    15711571{
    15721572        return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
     
    16211621                        continue;
    16221622               
    1623                 switch (IPC_GET_METHOD(call)) {
     1623                switch (IPC_GET_IMETHOD(call)) {
    16241624                case IPC_M_PHONE_HUNGUP:
    16251625                        client_connected = false;
Note: See TracChangeset for help on using the changeset viewer.