Changes in uspace/srv/hid/adb_mouse/adb_dev.c [79ae36dd:ffa2c8ef] in 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"
@@ -50 +45 @@
 static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall);
 
+static int dev_phone;
+
 int adb_dev_init(void)
 {
-        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;
+        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;
         }
-        
-        int dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
+
+        dev_phone = fd_phone(input_fd);
         if (dev_phone < 0) {
-                printf("%s: Failed connecting to ADB\n", NAME);
-                return ENOENT;
+                printf(NAME ": Failed to connect to device\n");
+                return false;
         }
-        
+
         /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
@@ -85 +84 @@
 
                 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 IPC_FIRST_USER_METHOD:
                         mouse_handle_data(IPC_GET_ARG1(call));