Changeset 41811af in mainline for uspace/srv/hid/kbd/generic/kbd.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/kbd/generic/kbd.c (modified) (7 diffs)

uspace/srv/hid/kbd/generic/kbd.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <ipc/ns.h>
+#include <ns.h>
+#include <ns_obsolete.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <adt/fifo.h>
@@ -50 +52 @@
 #include <io/keycode.h>
 #include <devmap.h>
-
 #include <kbd.h>
 #include <kbd_port.h>
 #include <kbd_ctl.h>
 #include <layout.h>
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME       "kbd"
@@ -88 +92 @@
 void kbd_push_ev(int type, unsigned int key)
 {
-        console_event_t ev;
+        kbd_event_t ev;
         unsigned mod_mask;
 
@@ -163 +167 @@
         ev.c = layout[active_layout]->parse_ev(&ev);
 
-        async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+        async_obsolete_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }
 
@@ -174 +178 @@
         async_answer_0(iid, EOK);
 
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         if (client_phone != -1) {
-                                async_hangup(client_phone);
+                                async_obsolete_hangup(client_phone);
                                 client_phone = -1;
                         }
@@ -185 +189 @@
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (client_phone != -1) {
@@ -222 +229 @@
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
+                        irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0);
         }