Changeset 1affcdf3 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (3 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
@@ -1620 +1621 @@
                         continue;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = false;
                         
@@ -1630 +1630 @@
                         /* Exit thread */
                         return;
+                }
                 
+                switch (IPC_GET_IMETHOD(call)) {
                 case FB_PUTCHAR:
                         ch = IPC_GET_ARG1(call);