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

Timestamp:

2011-01-14T13:35:14Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

0a9ea4a

Parents:

f401312

Message:

Fixed descriptor parsing.

• Properly parses standard descriptors.
• Properly gets report descriptor.

File:

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

uspace/drv/usbkbd/main.c

@@ -39 +39 @@
 #include <usb/descriptor.h>
 #include "descparser.h"
+#include "descdump.h"
 
 #define BUFFER_SIZE 32
@@ -109 +110 @@
         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;
+                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);
+        }
+
+        return EOK;
 }
 
@@ -162 +177 @@
         rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         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);
         
-        return rc;
+        return EOK;
 }