Changes in uspace/srv/hid/console/console.c [f03d3786:700af62] in mainline

File:

• uspace/srv/hid/console/console.c (modified) (2 diffs)

uspace/srv/hid/console/console.c

@@ -741 +741 @@
 }
 
-/** Try to connect to given keyboard, bypassing provided libc routines.
- *
- * @param devmap_path Path to keyboard without /dev prefix.
- * @return Phone or error code.
- */
-static int connect_keyboard_bypass(char *devmap_path)
-{
-        int devmap_phone = async_connect_me_to_blocking(PHONE_NS,
-            SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
-        if (devmap_phone < 0) {
-                return devmap_phone;
-        }
-        ipc_call_t answer;
-        aid_t req = async_send_2(devmap_phone, DEVMAP_DEVICE_GET_HANDLE,
-            0, 0,  &answer);
-
-        sysarg_t retval = async_data_write_start(devmap_phone,
-            devmap_path, str_size(devmap_path));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                ipc_hangup(devmap_phone);
-                return retval;
-        }
-
-        async_wait_for(req, &retval);
-
-        if (retval != EOK) {
-                ipc_hangup(devmap_phone);
-                return retval;
-        }
-
-        devmap_handle_t handle = (devmap_handle_t) IPC_GET_ARG1(answer);
-
-        ipc_hangup(devmap_phone);
-
-        int phone = async_connect_me_to(PHONE_NS,
-            SERVICE_DEVMAP, DEVMAP_CONNECT_TO_DEVICE, handle);
-        if (phone < 0) {
-                return phone;
-        }
-
-        /* NB: The callback connection is slotted for removal */
-        sysarg_t phonehash;
-        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
-            0, 0, NULL, NULL, NULL, NULL, &phonehash);
-        if (rc != EOK) {
-                printf(NAME ": Failed to create callback from input device\n");
-                return rc;
-        }
-
-        async_new_connection(phonehash, 0, NULL, keyboard_events);
-
-        printf(NAME ": we got a hit (new keyboard \"/dev/%s\").\n",
-            devmap_path);
-
-        return phone;
-}
-
 
 static int check_new_keyboards(void *arg)
@@ -809 +751 @@
                 async_usleep(1 * 500 * 1000);
                 char *path;
-                int rc = asprintf(&path, "class/%s\\%d", class_name, index);
+                int rc = asprintf(&path, "/dev/class/%s\\%d", class_name, index);
                 if (rc < 0) {
                         continue;
                 }
                 rc = 0;
-                rc = connect_keyboard_bypass(path);
+                rc = connect_keyboard(path);
                 if (rc > 0) {
                         /* We do not allow unplug. */