Changes in / [af430ce:37b1651d] in mainline

Location:

uspace

Files:

• drv/usbhid/kbddev.c (modified) (1 diff)
• drv/usbhid/usbhid.ma (modified) (1 diff)
• lib/usb/src/request.c (modified) (2 diffs)
• srv/hid/console/console.c (modified) (3 diffs)

uspace/drv/usbhid/kbddev.c

@@ -289 +289 @@
 
         usb_log_debug2("Sending key %d to the console\n", ev.key);
-        if (kbd_dev->console_phone < 0) {
-                usb_log_warning(
-                    "Connection to console not ready, key discarded.\n");
-                return;
-        }
+        assert(kbd_dev->console_phone != -1);
         
         async_msg_4(kbd_dev->console_phone, KBD_EVENT, ev.type, ev.key, 

uspace/drv/usbhid/usbhid.ma

@@ -1 @@
-100 usb&interface&class=HID&subclass=0x01&protocol=0x01
+10 usb&class=hid
+10 usb&class=HID
 10 usb&interface&class=HID
+10 usb&hid

uspace/lib/usb/src/request.c

@@ -504 +504 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess),
- *      first index has number 1 (index from descriptors can be used directly).
+ * @param[in] index String index (in native endianess).
  * @param[in] lang String language (in native endianess).
  * @param[out] string_ptr Where to store allocated string in native encoding.
@@ -516 +515 @@
                 return EBADMEM;
         }
-        /*
-         * Index is actually one byte value and zero index is used
-         * to retrieve list of supported languages.
-         */
-        if ((index < 1) || (index > 0xFF)) {
+        /* Index is actually one byte value. */
+        if (index > 0xFF) {
                 return ERANGE;
         }

uspace/srv/hid/console/console.c

@@ -41 +41 @@
 #include <ipc/ns.h>
 #include <errno.h>
-#include <str_error.h>
 #include <ipc/console.h>
 #include <unistd.h>
@@ -65 +64 @@
 #define NAME       "console"
 #define NAMESPACE  "term"
-/** Interval for checking for new keyboard (1/4s). */
-#define HOTPLUG_WATCH_INTERVAL (1000 * 250)
 
 /** Phone to the keyboard driver. */
@@ -728 +725 @@
         }
         
-        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0,
-            keyboard_events);
+        /* NB: The callback connection is slotted for removal */
+        sysarg_t phonehash;
+        sysarg_t taskhash;
+        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
+            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
         if (rc != EOK) {
-                printf(NAME ": " \
-                    "Failed to create callback from input device: %s.\n",
-                    str_error(rc));
+                printf(NAME ": Failed to create callback from input device\n");
                 return rc;
         }
         
-        printf(NAME ": found keyboard \"%s\".\n", path);
+        async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events);
+
+        printf(NAME ": we got a hit (new keyboard \"%s\").\n", path);
 
         return phone;
 }
 
-
-/** Periodically check for new keyboards in /dev/class/.
+/** Try to connect to given keyboard, bypassing provided libc routines.
  *
- * @param arg Class name.
- * @return This function should never exit.
+ * @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);
+                async_hangup(devmap_phone);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+
+        if (retval != EOK) {
+                async_hangup(devmap_phone);
+                return retval;
+        }
+
+        devmap_handle_t handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+
+        async_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;
+        sysarg_t taskhash;
+        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
+            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
+        if (rc != EOK) {
+                printf(NAME ": Failed to create callback from input device\n");
+                return rc;
+        }
+
+        async_new_connection(taskhash, 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)
 {
         char *class_name = (char *) arg;
 
-        size_t index = 1;
+        int index = 1;
 
         while (true) {
-                async_usleep(HOTPLUG_WATCH_INTERVAL);
+                async_usleep(1 * 500 * 1000);
                 char *path;
-                int rc = asprintf(&path, "/dev/class/%s\\%zu",
-                    class_name, index);
+                int rc = asprintf(&path, "class/%s\\%d", class_name, index);
                 if (rc < 0) {
                         continue;
                 }
                 rc = 0;
-                rc = connect_keyboard(path);
+                rc = connect_keyboard_bypass(path);
                 if (rc > 0) {
                         /* We do not allow unplug. */