Changeset 6986418 in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2011-01-14T12:20:54Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

b2a6fcfe

Parents:

2b0db98

Message:

Descriptor parsing modified (fixed)

• change usbkbd_parse_descriptors() not to parse class-specific descriptors as these are retrieved differently
• dump functions moved to descdump.h/c
• getting report descriptor in usbkbd/main.c
• changed descriptor structures (hid.h) to reflect, that there is only one report descriptor

File:

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

uspace/drv/usbkbd/main.c

@@ -107 +107 @@
  * 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) {
+                uint8_t type = 
+                    kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.type;
+                // TODO: endianness
+                uint16_t length = 
+                    kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.length;
+
+                // allocate space for the report descriptor
+                kbd_dev->conf->interfaces[i].report_desc = (uint8_t *)malloc(length);
+                // get the descriptor from the device
+                
+        }
+}
+
 static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
 {
@@ -147 +166 @@
         rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         free(descriptors);
-        
-        //usbkbd_print_config(kbd_dev->conf);
+
+        // get and report descriptors
+        rc = usbkbd_get_report_descriptor(kbd_dev);
+        
+        usbkbd_print_config(kbd_dev->conf);
         
         return rc;
@@ -223 +245 @@
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
+        return;
+        
         int rc;
         usb_handle_t handle;