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

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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) (3 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
@@ -256 +256 @@
 }
 
-static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         size_t intersize = 0;
@@ -413 +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);