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

Timestamp:

2011-01-14T13:35:14Z (13 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/descparser.c (modified) (10 diffs)

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);
-                }
+                }*/
         }
 }