Changes in uspace/drv/usbkbd/main.c [101ef25c:dafab9e0] in mainline

File:

• uspace/drv/usbkbd/main.c (modified) (6 diffs)

uspace/drv/usbkbd/main.c

@@ -32 +32 @@
 #include <fibril.h>
 #include <usb/classes/hid.h>
+#include <usb/classes/hidparser.h>
+#include <usb/devreq.h>
+#include <usb/descriptor.h>
 
 #define BUFFER_SIZE 32
@@ -37 +40 @@
 
 static const usb_endpoint_t CONTROL_EP = 0;
+
+/*
+ * Callbacks for parser
+ */
+static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
+                                    void *arg)
+{
+
+}
+
+/*
+ * Kbd functions
+ */
+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;
+        }
+        
+        // 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;
+}
 
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
@@ -66 +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(kbd_dev);
         // TODO: parse descriptors and save endpoints
 
@@ -75 +172 @@
 
 static void usbkbd_process_interrupt_in(usb_hid_dev_kbd_t *kbd_dev,
-                                        char *buffer, size_t actual_size)
+                                        uint8_t *buffer, size_t actual_size)
 {
         /*
@@ -81 +178 @@
          * now only take last 6 bytes and process, i.e. send to kbd
          */
+
+        usb_hid_report_in_callbacks_t *callbacks =
+            (usb_hid_report_in_callbacks_t *)malloc(
+                sizeof(usb_hid_report_in_callbacks_t));
+        callbacks->keyboard = usbkbd_process_keycodes;
+
+        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+            NULL);
 }
 
@@ -87 +192 @@
         int rc;
         usb_handle_t handle;
-        char buffer[BUFFER_SIZE];
+        uint8_t buffer[BUFFER_SIZE];
         size_t actual_size;
         //usb_endpoint_t poll_endpoint = 1;