Changeset 6a44ee4 in mainline for uspace/srv/hid/fb/fb.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/fb.c (modified) (4 diffs)

uspace/srv/hid/fb/fb.c

@@ -59 +59 @@
 #include <byteorder.h>
 #include <io/screenbuffer.h>
-
 #include "font-8x16.h"
 #include "fb.h"
 #include "main.h"
 #include "ppm.h"
-
 #include "pointer.xbm"
 #include "pointer_mask.xbm"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define DEFAULT_BGCOLOR  0xf0f0f0
@@ -1575 +1576 @@
  *
  */
-static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         unsigned int vp = 0;
@@ -1620 +1622 @@
                         continue;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = false;
                         
@@ -1630 +1631 @@
                         /* Exit thread */
                         return;
+                }
                 
+                switch (IPC_GET_IMETHOD(call)) {
                 case FB_PUTCHAR:
                         ch = IPC_GET_ARG1(call);