Changeset 64861b8 in mainline for uspace/drv

Timestamp:

2011-01-21T12:26:09Z (15 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

Location:

uspace/drv

Files:

• usbkbd/descparser.c (modified) (6 diffs)
• usbkbd/main.c (modified) (2 diffs)
• vhc/devices.c (modified) (1 diff)
• vhc/hc.c (modified) (2 diffs)
• vhc/hc.h (modified) (1 diff)

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

uspace/drv/usbkbd/main.c

@@ -130 +130 @@
                 assert(actual_size == length);
 
-                dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
-                    kbd_dev->conf->interfaces[i].report_desc, length);
+                //dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
+                //    kbd_dev->conf->interfaces[i].report_desc, length);
         }
 
@@ -189 +189 @@
         }
         
-        usbkbd_print_config(kbd_dev->conf);
+        //usbkbd_print_config(kbd_dev->conf);
 
         /*

uspace/drv/vhc/devices.c

@@ -138 +138 @@
                 } else {
                         async_wait_for(req, &answer_rc);
+                        transaction->actual_len = IPC_GET_ARG1(answer_data);
                         rc = (int)answer_rc;
                 }

uspace/drv/vhc/hc.c

@@ -96 +96 @@
             usb_str_transaction_outcome(outcome));
         
-        transaction->callback(transaction->buffer, transaction->len, outcome,
-            transaction->callback_arg);
+        transaction->callback(transaction->buffer, transaction->actual_len,
+            outcome, transaction->callback_arg);
 }
 
@@ -169 +169 @@
         transaction->buffer = buffer;
         transaction->len = len;
+        transaction->actual_len = len;
         transaction->callback = callback;
         transaction->callback_arg = arg;

uspace/drv/vhc/hc.h

@@ -65 +65 @@
         /** Transaction data length. */
         size_t len;
+        /** Data length actually transfered. */
+        size_t actual_len;
         /** Callback after transaction is done. */
         hc_transaction_done_callback_t callback;