Changes in uspace/srv/hid/kbd/generic/kbd.c [79ae36dd:57d129e] in 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 <ns.h>
-#include <ns_obsolete.h>
+#include <ipc/ns.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <errno.h>
 #include <adt/fifo.h>
@@ -52 +50 @@
 #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"
@@ -92 +88 @@
 void kbd_push_ev(int type, unsigned int key)
 {
-        kbd_event_t ev;
+        console_event_t ev;
         unsigned mod_mask;
 
@@ -167 +163 @@
         ev.c = layout[active_layout]->parse_ev(&ev);
 
-        async_obsolete_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+        async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }
 
@@ -178 +174 @@
         async_answer_0(iid, EOK);
 
-        while (true) {
+        while (1) {
                 callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
                         if (client_phone != -1) {
-                                async_obsolete_hangup(client_phone);
+                                async_hangup(client_phone);
                                 client_phone = -1;
                         }
@@ -189 +185 @@
                         async_answer_0(callid, EOK);
                         return;
-                }
-                
-                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (client_phone != -1) {
@@ -229 +222 @@
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0);
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }