Changeset 1affcdf3 in mainline for uspace/srv/hid/kbd/port/adb.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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 changes

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>
@@ -42 +43 @@
 #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);
@@ -52 +55 @@
 int kbd_port_init(void)
 {
-        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;
+        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;
+        
+        /* 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) {
+                printf(NAME ": Failed to create callback from device\n");
+                return rc;
         }
-
-        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 */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
-                printf(NAME ": Failed to create callback from device\n");
-                return false;
-        }
-
-        return 0;
+        
+        return EOK;
 }
 
@@ -100 +100 @@
 
                 int retval;
-
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case ADB_REG_NOTIF:
                         adb_kbd_reg0_data(IPC_GET_ARG1(call));