Changeset 8f5b6561 in mainline

Timestamp:

2011-02-11T18:57:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

45c01a1, 67b6fc5, 6b1931b

Parents:

345ea18 (diff), b43bcf1 (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 better pipe initialization in HID driver

Location:

uspace

Files:

• drv/usbhid/main.c (modified) (9 diffs)
• lib/usb/include/usb/classes/hid.h (modified) (1 diff)

uspace/drv/usbhid/main.c

@@ -45 +45 @@
 #include <str_error.h>
 #include <fibril.h>
+#include <usb/debug.h>
+#include <usb/classes/classes.h>
 #include <usb/classes/hid.h>
 #include <usb/classes/hidparser.h>
@@ -61 +63 @@
 #define GUESSED_POLL_ENDPOINT 1
 
+/** Keyboard polling endpoint description for boot protocol class. */
+static usb_endpoint_description_t poll_endpoint_description = {
+        .transfer_type = USB_TRANSFER_INTERRUPT,
+        .direction = USB_DIRECTION_IN,
+        .interface_class = USB_CLASS_HID,
+        .interface_subclass = USB_HID_SUBCLASS_BOOT,
+        .interface_protocol = USB_HID_PROTOCOL_KEYBOARD,
+        .flags = 0
+};
+
 static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
 static device_ops_t keyboard_ops = {
@@ -330 +342 @@
         }
         
+        /*
+         * Initialize the interrupt in endpoint.
+         */
+        usb_endpoint_mapping_t endpoint_mapping[1] = {
+                {
+                        .pipe = &kbd_dev->poll_pipe,
+                        .description = &poll_endpoint_description
+                }
+        };
+        rc = usb_endpoint_pipe_initialize_from_configuration(
+            endpoint_mapping, 1,
+            descriptors, config_desc.total_length,
+            &kbd_dev->wire);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize poll pipe: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        if (!endpoint_mapping[0].present) {
+                usb_log_warning("Not accepting device, " \
+                    "not boot-protocol keyboard.\n");
+                return EREFUSED;
+        }
+
+
+
+
         kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, 
             sizeof(usb_hid_configuration_t));
@@ -337 +376 @@
         }
         
-        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
+        /*rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         free(descriptors);
         if (rc != EOK) {
@@ -344 +383 @@
         }
 
-        // get and report descriptors
+        // get and report descriptors*/
         rc = usbkbd_get_report_descriptor(kbd_dev);
         if (rc != EOK) {
@@ -361 +400 @@
      *    as the endpoint for polling
          */
-        
+
         return EOK;
 }
@@ -396 +435 @@
         if (rc != EOK) {
                 printf("Failed to initialize default control pipe: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
-        rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
-            GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, 8, USB_DIRECTION_IN);
-        if (rc != EOK) {
-                printf("Failed to initialize interrupt in pipe: %s.\n",
                     str_error(rc));
                 goto error_leave;
@@ -418 +449 @@
         usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
         //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1);
-        usbkbd_process_descriptors(kbd_dev);
+        rc = usbkbd_process_descriptors(kbd_dev);
         usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
+        if (rc != EOK) {
+                goto error_leave;
+        }
 
         return kbd_dev;
@@ -577 +611 @@
 int main(int argc, char *argv[])
 {
+        usb_log_enable(USB_LOG_LEVEL_INFO, "usbhid");
         return driver_main(&kbd_driver);
 }

uspace/lib/usb/include/usb/classes/hid.h

@@ -50 +50 @@
         USB_HIDREQ_SET_PROTOCOL = 11
 } usb_hid_request_t;
+
+/** USB/HID subclass constants. */
+typedef enum {
+        USB_HID_SUBCLASS_NONE = 0,
+        USB_HID_SUBCLASS_BOOT = 1
+} usb_hid_subclass_t;
 
 /** USB/HID interface protocols. */