Changes in uspace/srv/hid/input/port/chardev.c [15f3c3f:854eddd6] in mainline

File:

• uspace/srv/hid/input/port/chardev.c (modified) (7 diffs)

uspace/srv/hid/input/port/chardev.c

@@ -37 +37 @@
 #include <ipc/char.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <input.h>
 #include <kbd_port.h>
 #include <kbd.h>
-#include <loc.h>
+#include <devmap.h>
+#include <devmap_obsolete.h>
 #include <errno.h>
 #include <stdio.h>
@@ -59 +61 @@
 
 static kbd_dev_t *kbd_dev;
-static async_sess_t *dev_sess;
+static int dev_phone;
 
 /** List of devices to try connecting to. */
@@ -71 +73 @@
 static int chardev_port_init(kbd_dev_t *kdev)
 {
-        service_id_t service_id;
-        async_exch_t *exch;
+        devmap_handle_t handle;
         unsigned int i;
         int rc;
@@ -79 +80 @@
         
         for (i = 0; i < num_devs; i++) {
-                rc = loc_service_get_id(in_devs[i], &service_id, 0);
+                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
                 if (rc == EOK)
                         break;
@@ -89 +90 @@
         }
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id,
-            IPC_FLAG_BLOCKING);
-        if (dev_sess == NULL) {
+        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
+        if (dev_phone < 0) {
                 printf("%s: Failed connecting to device\n", NAME);
                 return ENOENT;
         }
         
-        exch = async_exchange_begin(dev_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with device\n", NAME);
-                async_hangup(dev_sess);
-                return ENOMEM;
-        }
-        
         /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
-        async_exchange_end(exch);
-        
-        if (rc != 0) {
-                printf("%s: Failed to create callback from device\n", NAME);
-                async_hangup(dev_sess);
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events,
+            NULL) != 0) {
+                printf(NAME ": Failed to create callback from device\n");
                 return -1;
         }
-        
+
         return 0;
 }
@@ -126 +116 @@
 static void chardev_port_write(uint8_t data)
 {
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with device\n", NAME);
-                return;
-        }
-
-        async_msg_1(exch, CHAR_WRITE_BYTE, data);
-        async_exchange_end(exch);
+        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
@@ -153 +136 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case CHAR_NOTIF_BYTE:
-                        kbd_push_data(kbd_dev, IPC_GET_ARG1(call));
+                        kbd_push_scancode(kbd_dev, IPC_GET_ARG1(call));
                         break;
                 default: