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

File:

• uspace/srv/hid/input/port/adb.c (modified) (4 diffs)

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

@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <input.h>
 #include <kbd_port.h>
@@ -43 +44 @@
 #include <fcntl.h>
 #include <errno.h>
-#include <loc.h>
+#include <devmap.h>
+#include <devmap_obsolete.h>
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -61 +63 @@
 
 static kbd_dev_t *kbd_dev;
-static async_sess_t *dev_sess;
+static int dev_phone;
 
 static int adb_port_init(kbd_dev_t *kdev)
 {
         const char *dev = "adb/kbd";
-        service_id_t service_id;
-        async_exch_t *exch;
-        int rc;
-        
+        devmap_handle_t handle;
+
         kbd_dev = kdev;
         
-        rc = loc_service_get_id(dev, &service_id, 0);
-        if (rc != EOK)
+        int rc = devmap_device_get_handle(dev, &handle, 0);
+        if (rc == EOK) {
+                dev_phone = devmap_obsolete_device_connect(handle, 0);
+                if (dev_phone < 0) {
+                        printf("%s: Failed to connect to device\n", NAME);
+                        return dev_phone;
+                }
+        } else
                 return rc;
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
-        if (dev_sess == NULL) {
-                printf("%s: Failed to connect 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);
+        rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events,
+            NULL);
         if (rc != EOK) {
-                printf("%s: Failed to create callback from device\n", NAME);
-                async_hangup(dev_sess);
+                printf(NAME ": Failed to create callback from device\n");
                 return rc;
         }
@@ -142 +134 @@
 static void adb_kbd_reg0_data(uint16_t data)
 {
-        uint8_t b0 = (data >> 8) & 0xff;
-        uint8_t b1 = data & 0xff;
-        
+        uint8_t b0, b1;
+
+        b0 = (data >> 8) & 0xff;
+        b1 = data & 0xff;
+
         if (b0 != 0xff)
-                kbd_push_data(kbd_dev, b0);
-        
+                kbd_push_scancode(kbd_dev, b0);
         if (b1 != 0xff)
-                kbd_push_data(kbd_dev, b1);
+                kbd_push_scancode(kbd_dev, b1);
 }