Changeset 45019865 in mainline

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.

Location:

uspace

Files:

• drv/usbkbd/descdump.c (modified) (1 diff)
• drv/usbkbd/descparser.c (modified) (10 diffs)
• drv/usbkbd/main.c (modified) (3 diffs)
• lib/usb/include/usb/classes/hid.h (modified) (1 diff)

uspace/drv/usbkbd/descdump.c

@@ -125 +125 @@
         printf(INDENT "bCountryCode = %d\n", d->country_code);
         printf(INDENT "bNumDescriptors = %d\n", d->class_desc_count);
+        printf(INDENT "bDescriptorType = %d\n", d->report_desc_info.type);
+        printf(INDENT "wDescriptorLength = %d\n", d->report_desc_info.length);
 }
 

uspace/drv/usbkbd/descparser.c

@@ -52 +52 @@
                         free(config->interfaces[i].endpoints);
                 }
-                if (iface->class_desc_info != NULL) {
+                /*if (iface->class_desc_info != NULL) {
                         free(iface->class_desc_info);
                 }
@@ -64 +64 @@
                                 }
                         }
-                }
+                }*/
         }
         
@@ -152 +152 @@
                         }
                         ep_i = 0;
+
+                        printf("Remaining size: %d\n", size - (size_t)(pos - data));
                         
                         break;
@@ -184 +186 @@
                         break;
                 case USB_DESCTYPE_HID:
-                        if (desc_size < sizeof(usb_standard_hid_descriptor_t)
-                           + sizeof(usb_standard_hid_class_descriptor_info_t)) {
+                        if (desc_size < sizeof(usb_standard_hid_descriptor_t)) {
+                                printf("Wrong size of descriptor: %d (should be %d)\n",
+                                    desc_size, sizeof(usb_standard_hid_descriptor_t));
                                 ret = EINVAL;
                                 goto end;
@@ -195 +198 @@
                         pos += sizeof(usb_standard_hid_descriptor_t);
                         
-                        if (actual_iface->hid_desc.class_desc_count
+                        /*if (actual_iface->hid_desc.class_desc_count
                             * sizeof(usb_standard_hid_class_descriptor_info_t)
                             != desc_size 
@@ -203 +206 @@
                                 ret = EINVAL;
                                 goto end;
-                        }
+                        }*/
 
                         printf("Parsed HID descriptor header: \n");
@@ -209 +212 @@
                         
                         // allocate space for all class-specific descriptor info
-                        actual_iface->class_desc_info = 
+                        /*actual_iface->class_desc_info = 
                             (usb_standard_hid_class_descriptor_info_t *)malloc(
                             actual_iface->hid_desc.class_desc_count
@@ -216 +219 @@
                                 ret = ENOMEM;
                                 goto end;
-                        }
+                        }*/
                         
                         // allocate space for all class-specific descriptors
@@ -317 +320 @@
                 dump_standard_hid_descriptor_header(&iface_d->hid_desc);
                 printf("\n");
+                dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
+                    iface_d->report_desc, iface_d->hid_desc.report_desc_info.length);
+                printf("\n");
 //              printf("%d class-specific descriptors\n", 
 //                  iface_d->hid_desc.class_desc_count);
-                for (j = 0; j < iface_d->hid_desc.class_desc_count; ++j) {
+                /*for (j = 0; j < iface_d->hid_desc.class_desc_count; ++j) {
                         dump_standard_hid_class_descriptor_info(
                             &iface_d->class_desc_info[j]);
@@ -329 +335 @@
                             iface_d->class_descs[j],
                             iface_d->class_desc_info[j].length);
-                }
+                }*/
         }
 }

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;
 }
 

uspace/lib/usb/include/usb/classes/hid.h

@@ -98 +98 @@
         uint8_t class_desc_count;
         /** First mandatory class descriptor (Report) info. */
-        usb_standard_hid_descriptor_class_item_t report_desc_info;
+        usb_standard_hid_class_descriptor_info_t report_desc_info;
 } __attribute__ ((packed)) usb_standard_hid_descriptor_t;