Changes in uspace/srv/hid/kbd/port/adb.c [79ae36dd:4f14e1f8] in mainline

File:

• uspace/srv/hid/kbd/port/adb.c (modified) (5 diffs)

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

@@ -30 +30 @@
  * @ingroup kbd
  * @{
- */
+ */ 
 /** @file
  * @brief ADB keyboard port driver.
@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <kbd_port.h>
 #include <kbd.h>
@@ -43 +42 @@
 #include <fcntl.h>
 #include <errno.h>
-#include <devmap.h>
-#include <devmap_obsolete.h>
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
@@ -55 +52 @@
 int kbd_port_init(void)
 {
-        const char *dev = "adb/kbd";
-        devmap_handle_t handle;
-        
-        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;
-        
+        const char *input = "/dev/adb/kbd";
+        int input_fd;
+
+        printf(NAME ": open %s\n", input);
+
+        input_fd = open(input, O_RDONLY);
+        if (input_fd < 0) {
+                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
+                return false;
+        }
+
+        dev_phone = fd_phone(input_fd);
+        if (dev_phone < 0) {
+                printf(NAME ": Failed to connect to device\n");
+                return false;
+        }
+
         /* NB: The callback connection is slotted for removal */
-        rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events);
-        if (rc != EOK) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
-                return rc;
+                return false;
         }
-        
-        return EOK;
+
+        return 0;
 }
 
@@ -100 +100 @@
 
                 int retval;
-                
-                if (!IPC_GET_IMETHOD(call)) {
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
                         return;
-                }
-                
-                switch (IPC_GET_IMETHOD(call)) {
                 case ADB_REG_NOTIF:
                         adb_kbd_reg0_data(IPC_GET_ARG1(call));