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

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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) (4 diffs)

uspace/srv/hid/fb/ega.c

@@ -52 +52 @@
 #include <io/screenbuffer.h>
 #include <sys/types.h>
-
 #include "ega.h"
 #include "main.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define MAX_SAVED_SCREENS  256
@@ -254 +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;
@@ -291 +294 @@
                 int retval;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = 0;
                         async_answer_0(callid, EOK);
@@ -298 +300 @@
                         /* Exit thread */
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_SHARE_OUT:
                         /* We accept one area for data interchange */