Changes in / [b82ec8d:e7b9541] in mainline

Location:

uspace

Files:

• drv/usbkbd/main.c (modified) (4 diffs)
• lib/usb/include/usb/classes/hid.h (modified) (1 diff)
• lib/usb/src/hidparser.c (modified) (1 diff)

uspace/drv/usbkbd/main.c

@@ -34 +34 @@
 #include <usb/classes/hidparser.h>
 #include <usb/devreq.h>
+#include <usb/descriptor.h>
 
 #define BUFFER_SIZE 32
@@ -52 +53 @@
  * Kbd functions
  */
-static int usbkbd_get_descriptors()
-{
-        // copy-pasted:
-        
-        /* Prepare the setup packet. */
-        usb_device_request_setup_packet_t setup_packet = {
-                .request_type = 128,
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .index = 0,
-                .length = sizeof(usb_standard_device_descriptor_t)
-        };
-        
-        setup_packet.value_high = USB_DESCTYPE_DEVICE;
-        setup_packet.value_low = 0;
-
-        /* Prepare local descriptor. */
-        size_t actually_transferred = 0;
-        usb_standard_device_descriptor_t descriptor_tmp;
-
-        /* Perform the control read transaction. */
-        int rc = usb_drv_psync_control_read(phone, target,
-            &setup_packet, sizeof(setup_packet),
-            &descriptor_tmp, sizeof(descriptor_tmp), &actually_transferred);
-
+static int usbkbd_parse_descriptors(usb_hid_dev_kbd_t *kbd_dev,
+                                    const uint8_t *data, size_t size)
+{
+//      const uint8_t *pos = data;
+        
+//      // get the configuration descriptor (should be first)
+//      if (*pos != sizeof(usb_standard_configuration_descriptor_t)
+//          || *(pos + 1) != USB_DESCTYPE_CONFIGURATION) {
+//              fprintf(stderr, "Wrong format of configuration descriptor");
+//              return EINVAL;
+//      }
+        
+//      usb_standard_configuration_descriptor_t config_descriptor;
+//      memcpy(&config_descriptor, pos, 
+//          sizeof(usb_standard_configuration_descriptor_t));
+//      pos += sizeof(usb_standard_configuration_descriptor_t);
+        
+//      // parse other descriptors
+//      while (pos - data < size) {
+//              //uint8_t desc_size = *pos;
+//              uint8_t desc_type = *(pos + 1);
+//              switch (desc_type) {
+//              case USB_DESCTYPE_INTERFACE:
+//                      break;
+//              case USB_DESCTYPE_ENDPOINT:
+//                      break;
+//              case USB_DESCTYPE_HID:
+//                      break;
+//              case USB_DESCTYPE_HID_REPORT:
+//                      break;
+//              case USB_DESCTYPE_HID_PHYSICAL:
+//                      break;
+//              }
+//      }
+        
+        return EOK;
+}
+
+static int usbkbd_get_descriptors(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // get the first configuration descriptor (TODO: or some other??)
+        usb_standard_configuration_descriptor_t config_desc;
+        
+        int rc = usb_drv_req_get_bare_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc);
+        
         if (rc != EOK) {
                 return rc;
         }
         
-        // end of copy-paste
+        // prepare space for all underlying descriptors
+        uint8_t *descriptors = (uint8_t *)malloc(config_desc.total_length);
+        if (descriptors == NULL) {
+                return ENOMEM;
+        }
+        
+        size_t transferred = 0;
+        // get full configuration descriptor
+        rc = usb_drv_req_get_full_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, descriptors,
+            config_desc.total_length, &transferred);
+        
+        if (rc != EOK) {
+                return rc;
+        }
+        if (transferred != config_desc.total_length) {
+                return ELIMIT;
+        }
+        
+        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
+        free(descriptors);
+        
+        return rc;
 }
 
@@ -111 +156 @@
         // default endpoint
         kbd_dev->default_ep = CONTROL_EP;
+        
+        /*
+         * will need all descriptors:
+         * 1) choose one configuration from configuration descriptors 
+         *    (set it to the device)
+         * 2) set endpoints from endpoint descriptors
+         */
 
         // TODO: get descriptors
-        usbkbd_get_descriptors();
+        usbkbd_get_descriptors(kbd_dev);
         // TODO: parse descriptors and save endpoints
 
@@ -132 +184 @@
         callbacks->keyboard = usbkbd_process_keycodes;
 
-        usb_hid_parse_report(kbd_dev->parser, buffer, callbacks, NULL);
+        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+            NULL);
 }
 

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

@@ -58 +58 @@
 } usb_hid_protocol_t;
 
+/** Part of standard USB HID descriptor specifying one class descriptor.
+ *
+ * (See HID Specification, p.22)
+ */
+typedef struct {
+        /** Type of class descriptor (Report or Physical). */
+        uint8_t class_descriptor_type;
+        /** Length of class descriptor. */
+        uint16_t class_descriptor_length;
+} __attribute__ ((packed)) usb_standard_hid_descriptor_class_item_t;
+
+/** Standard USB HID descriptor.
+ *
+ * (See HID Specification, p.22)
+ * 
+ * It is actually only the "header" of the descriptor, as it may have arbitrary
+ * length if more than one class descritor is provided.
+ */
+typedef struct {
+        /** Size of this descriptor in bytes. */
+        uint8_t length;
+        /** Descriptor type (USB_DESCTYPE_HID). */
+        uint8_t descriptor_type;
+        /** HID Class Specification release. */
+        uint16_t spec_release;
+        /** Country code of localized hardware. */
+        uint8_t country_code;
+        /** Total number of class (i.e. Report and Physical) descriptors. */
+        uint8_t class_count;
+        /** First mandatory class descriptor info. */
+        usb_standard_hid_descriptor_class_item_t class_descriptor;
+} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
+
+
 /**
  * @brief USB/HID keyboard device type.

uspace/lib/usb/src/hidparser.c

@@ -75 +75 @@
         
         callbacks->keyboard(keys, 6, arg);
+        
+        return EOK;
 }