Changeset 41811af in mainline for uspace/srv/hid/adb_mouse/adb_dev.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/hid/adb_mouse/adb_dev.c (modified) (3 diffs)

uspace/srv/hid/adb_mouse/adb_dev.c

@@ -39 +39 @@
 #include <fcntl.h>
 #include <errno.h>
+#include <devmap.h>
+#include <devmap_obsolete.h>
+#include <async.h>
+#include <async_obsolete.h>
+#include <kernel/ipc/ipc_methods.h>
 
 #include "adb_mouse.h"
@@ -45 +50 @@
 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall);
 
-static int dev_phone;
-
 int adb_dev_init(void)
 {
-        const char *input = "/dev/adb/mouse";
-        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;
+        devmap_handle_t handle;
+        int rc = devmap_device_get_handle("adb/mouse", &handle,
+            IPC_FLAG_BLOCKING);
+        
+        if (rc != EOK) {
+                printf("%s: Failed resolving ADB\n", NAME);
+                return rc;
         }
-
-        dev_phone = fd_phone(input_fd);
+        
+        int dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
         if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
+                printf("%s: Failed connecting to ADB\n", NAME);
+                return ENOENT;
         }
-
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
@@ -84 +85 @@
 
                 int retval;
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* TODO: Handle hangup */
+                        return;
+                }
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* TODO: Handle hangup */
-                        return;
                 case IPC_FIRST_USER_METHOD:
                         mouse_handle_data(IPC_GET_ARG1(call));