Changes in uspace/drv/usbkbd/main.c [692f13e4:f9a0cef] in mainline

File:

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

uspace/drv/usbkbd/main.c

@@ -35 +35 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
-#include "descparser.h"
 
 #define BUFFER_SIZE 32
 #define NAME "usbkbd"
 
-static const usb_endpoint_t CONTROL_EP = 0;
+#define GUESSED_POLL_ENDPOINT 1
 
 /*
@@ -48 +47 @@
                                     void *arg)
 {
-        printf("Got keys: ");
-        unsigned i;
-        for (i = 0; i < count; ++i) {
-                printf("%d ", key_codes[i]);
-        }
-        printf("\n");
+
 }
 
@@ -59 +53 @@
  * Kbd functions
  */
-static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // get the first configuration descriptor (TODO: parse also other!)
+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;
         
@@ -90 +122 @@
         }
         
-        kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, 
-            sizeof(usb_hid_configuration_t));
-        if (kbd_dev->conf == NULL) {
-                free(descriptors);
-                return ENOMEM;
-        }
-        
-        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
+        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
         free(descriptors);
         
@@ -105 +130 @@
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
-            sizeof(usb_hid_dev_kbd_t));
+        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
+                        sizeof(usb_hid_dev_kbd_t));
 
         if (kbd_dev == NULL) {
@@ -130 +155 @@
 
         // default endpoint
-        kbd_dev->default_ep = CONTROL_EP;
+        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
         
         /*
@@ -139 +164 @@
          */
 
-        // TODO: get descriptors, parse descriptors and save endpoints
-        usbkbd_process_descriptors(kbd_dev);
+        // TODO: get descriptors
+        usbkbd_get_descriptors(kbd_dev);
+        // TODO: parse descriptors and save endpoints
 
         return kbd_dev;
@@ -178 +204 @@
         usb_target_t poll_target = {
                 .address = kbd_dev->address,
-                .endpoint = kbd_dev->default_ep
+                .endpoint = kbd_dev->poll_endpoint
         };
 
         while (true) {
+                async_usleep(1000 * 1000);
                 rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone,
                     poll_target, buffer, BUFFER_SIZE, &actual_size, &handle);