Changes in uspace/drv/usbkbd/main.c [fbddf94:38c5dfa] in mainline

File:

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

uspace/drv/usbkbd/main.c

@@ -38 +38 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
-#include "descparser.h"
-#include "descdump.h"
 
 #define BUFFER_SIZE 32
@@ -90 +88 @@
  * Callbacks for parser
  */
-static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
-                                    uint8_t modifiers, void *arg)
-{
-        printf("Got keys: ");
-        unsigned i;
-        for (i = 0; i < count; ++i) {
-                printf("%d ", key_codes[i]);
-        }
-        printf("\n");
+static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
+                                    void *arg)
+{
+
 }
 
@@ -104 +97 @@
  * Kbd functions
  */
-static int usbkbd_get_report_descriptor(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // iterate over all configurations and interfaces
-        // TODO: more configurations!!
-        unsigned i;
-        for (i = 0; i < kbd_dev->conf->config_descriptor.interface_count; ++i) {
-                // TODO: endianness
-                uint16_t length = 
-                    kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.length;
-                size_t actual_size = 0;
-
-                // allocate space for the report descriptor
-                kbd_dev->conf->interfaces[i].report_desc = (uint8_t *)malloc(length);
-                
-                // get the descriptor from the device
-                int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
-                    kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 
-                    0, i, kbd_dev->conf->interfaces[i].report_desc, length, 
-                    &actual_size);
-
-                if (rc != EOK) {
-                        return rc;
-                }
-
-                assert(actual_size == length);
-
-                //dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
-                //    kbd_dev->conf->interfaces[i].report_desc, length);
-        }
-
+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_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // get the first configuration descriptor (TODO: parse also other!)
+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;
         
@@ -168 +166 @@
         }
         
-        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);
-        if (rc != EOK) {
-                printf("Problem with parsing standard descriptors.\n");
-                return rc;
-        }
-
-        // get and report descriptors
-        rc = usbkbd_get_report_descriptor(kbd_dev);
-        if (rc != EOK) {
-                printf("Problem with parsing HID REPORT descriptor.\n");
-                return rc;
-        }
-        
-        //usbkbd_print_config(kbd_dev->conf);
-
-        /*
-         * TODO: 
-         * 1) select one configuration (lets say the first)
-         * 2) how many interfaces?? how to select one??
-     *    ("The default setting for an interface is always alternate setting zero.")
-         * 3) find endpoint which is IN and INTERRUPT (parse), save its number
-     *    as the endpoint for polling
-         */
-        
-        return EOK;
+        
+        return rc;
 }
 
 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) {
@@ -217 +186 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
-        if (rc < 0) {
-                printf("Problem setting phone to HC.\n");
-                free(kbd_dev);
-                return NULL;
-        }
-
-        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
-        if (rc < 0) {
-                printf("Problem getting address of the device.\n");
-                free(kbd_dev);
-                return NULL;
-        }
+        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+
+        kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
+            dev);
 
         // doesn't matter now that we have no address
@@ -248 +208 @@
          */
 
-        // 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;
@@ -257 +218 @@
                                         uint8_t *buffer, size_t actual_size)
 {
+        /*
+         * here, the parser will be called, probably with some callbacks
+         * 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(
@@ -262 +228 @@
         callbacks->keyboard = usbkbd_process_keycodes;
 
-        //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
-        //    NULL);
-        printf("Calling usb_hid_boot_keyboard_input_report()...\n)");
-        usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, NULL);
+        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+            NULL);
 }
 
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
-        return;
-        
         int rc;
         usb_handle_t handle;