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

Changeset db6e419 in mainline for uspace/srv/hid/fb/ega.c


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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/srv/hid/fb/ega.c

    re0e922d rdb6e419  
    5656
    5757// FIXME: remove this header
    58 #include <kernel/ipc/ipc_methods.h>
     58#include <abi/ipc/methods.h>
    5959
    6060#define MAX_SAVED_SCREENS  256
     
    414414                        retval = 0;
    415415                        break;
    416                 case FB_VP_DRAW_PIXMAP:
     416                case FB_VP_DRAW_IMGMAP:
    417417                        scr = IPC_GET_ARG2(call);
    418418                        retval = print_screen(scr);
    419419                        break;
    420                 case FB_VP2PIXMAP:
     420                case FB_VP2IMGMAP:
    421421                        retval = save_screen();
    422422                        break;
    423                 case FB_DROP_PIXMAP:
     423                case FB_DROP_IMGMAP:
    424424                        scr = IPC_GET_ARG1(call);
    425425                       
Note: See TracChangeset for help on using the changeset viewer.