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

File:

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

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

@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
+#include <input.h>
+#include <kbd_port.h>
+#include <kbd.h>
 #include <vfs/vfs.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <loc.h>
-#include "../input.h"
-#include "../kbd_port.h"
-#include "../kbd.h"
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -65 +65 @@
 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;
+        
         kbd_dev = kdev;
         
-        const char *dev = "adb/kbd";
-        service_id_t service_id;
-        int rc = loc_service_get_id(dev, &service_id, 0);
+        rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
@@ -79 +82 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(dev_sess);
+        exch = async_exchange_begin(dev_sess);
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with device\n", NAME);
@@ -86 +89 @@
         }
         
+        /* 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);
@@ -118 +122 @@
                 ipc_callid_t callid = async_get_call(&call);
 
-                int retval = EOK;
+                int retval;
                 
                 if (!IPC_GET_IMETHOD(call)) {