Changeset ca038b4 in mainline

Timestamp:

2010-12-12T16:50:48Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

692f13e4

Parents:

c694b7e

Message:

Configuration parsing

Added functions for parsing configuration descriptor and all underlying

descriptors (interface, endpoint, HID, class-specific).

Kbd driver uses new function usbkbd_parse_descriptors() to get the

configuration. As for now, only one configuration is considered.

Location:

uspace/drv/usbkbd

Files:

• Makefile (modified) (1 diff)
• descparser.c (added)
• descparser.h (added)
• main.c (modified) (5 diffs)

uspace/drv/usbkbd/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        main.c
+        main.c \
+        descparser.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/usbkbd/main.c

@@ -35 +35 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
+#include "descparser.h"
 
 #define BUFFER_SIZE 32
@@ -53 +54 @@
  * 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??)
+static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // get the first configuration descriptor (TODO: parse also other!)
         usb_standard_configuration_descriptor_t config_desc;
         
@@ -122 +85 @@
         }
         
-        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
+        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);
         free(descriptors);
         
@@ -130 +100 @@
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
-                        sizeof(usb_hid_dev_kbd_t));
+        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
+            sizeof(usb_hid_dev_kbd_t));
 
         if (kbd_dev == NULL) {
@@ -164 +134 @@
          */
 
-        // TODO: get descriptors
-        usbkbd_get_descriptors(kbd_dev);
-        // TODO: parse descriptors and save endpoints
+        // TODO: get descriptors, parse descriptors and save endpoints
+        usbkbd_process_descriptors(kbd_dev);
 
         return kbd_dev;