Changeset 41811af in mainline for uspace/srv/hid/fb/serial_console.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/hid/fb/serial_console.c (modified) (3 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -52 +52 @@
 #include "serial_console.h"
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 #define MAX_CONTROL 20
 
@@ -344 +347 @@
                 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);
@@ -351 +353 @@
                         /* Exit thread */
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_SHARE_OUT:
                         /* We accept one area for data interchange */