Changeset 64861b8 in mainline for uspace/drv/usbkbd/descparser.c

Timestamp:

2011-01-21T12:26:09Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e8ad0de

Parents:

b65ca41d (diff), 96b0faef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from development

File:

• uspace/drv/usbkbd/descparser.c (modified) (6 diffs)

uspace/drv/usbkbd/descparser.c

@@ -96 +96 @@
         pos += sizeof(usb_standard_configuration_descriptor_t);
 
-        printf("Parsed configuration descriptor: \n");
-        dump_standard_configuration_descriptor(0, &config->config_descriptor);
+        //printf("Parsed configuration descriptor: \n");
+        //dump_standard_configuration_descriptor(0, &config->config_descriptor);
         
         int ret = EOK;
@@ -139 +139 @@
                         pos += desc_size;
 
-                        printf("Parsed interface descriptor: \n");
-                        dump_standard_interface_descriptor(&actual_iface->iface_desc);
+                        //printf("Parsed interface descriptor: \n");
+                        //dump_standard_interface_descriptor(&actual_iface->iface_desc);
                         
                         // allocate space for endpoint descriptors
@@ -153 +153 @@
                         ep_i = 0;
 
-                        printf("Remaining size: %d\n", size - (size_t)(pos - data));
+                        //printf("Remaining size: %d\n", size - (size_t)(pos - data));
                         
                         break;
@@ -180 +180 @@
                         pos += desc_size;
 
-                        printf("Parsed endpoint descriptor: \n");
-                        dump_standard_endpoint_descriptor(&actual_iface->endpoints[ep_i]);
+                        //printf("Parsed endpoint descriptor: \n");
+                        //dump_standard_endpoint_descriptor(&actual_iface->endpoints[ep_i]);
                         ++ep_i;
                         
@@ -187 +187 @@
                 case USB_DESCTYPE_HID:
                         if (desc_size < sizeof(usb_standard_hid_descriptor_t)) {
-                                printf("Wrong size of descriptor: %d (should be %d)\n",
+                                printf("Wrong size of descriptor: %d (should be %zu)\n",
                                     desc_size, sizeof(usb_standard_hid_descriptor_t));
                                 ret = EINVAL;
@@ -208 +208 @@
                         }*/
 
-                        printf("Parsed HID descriptor header: \n");
-                        dump_standard_hid_descriptor_header(&actual_iface->hid_desc);
+                        //printf("Parsed HID descriptor header: \n");
+                        //dump_standard_hid_descriptor_header(&actual_iface->hid_desc);
                         
                         // allocate space for all class-specific descriptor info