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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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:

• uspace/srv/hid/fb/ega.c (modified) (2 diffs)

uspace/srv/hid/fb/ega.c

@@ -56 +56 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define MAX_SAVED_SCREENS  256
@@ -414 +414 @@
                         retval = 0;
                         break;
-                case FB_VP_DRAW_PIXMAP:
+                case FB_VP_DRAW_IMGMAP:
                         scr = IPC_GET_ARG2(call);
                         retval = print_screen(scr);
                         break;
-                case FB_VP2PIXMAP:
+                case FB_VP2IMGMAP:
                         retval = save_screen();
                         break;
-                case FB_DROP_PIXMAP:
+                case FB_DROP_IMGMAP:
                         scr = IPC_GET_ARG1(call);