Changeset 9babc17 in mainline

Timestamp:

2011-12-06T15:43:03Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e8d82cb

Parents:

e65cd3c4

Message:

ohci, root hub: Remove useless size check.

Response size is checked and data truncated in usb_batch_finish_error.

File:

• uspace/drv/bus/usb/ohci/root_hub.c (modified) (6 diffs)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -451 +451 @@
         const usb_device_request_setup_packet_t *setup_request =
             (usb_device_request_setup_packet_t *) request->setup_buffer;
-        size_t size;
-        const void *descriptor = NULL;
         const uint16_t setup_request_value = setup_request->value_high;
         switch (setup_request_value)
@@ -459 +457 @@
                 usb_log_debug2("USB_DESCTYPE_HUB\n");
                 /* Hub descriptor was generated locally */
-                descriptor = instance->descriptors.hub;
-                size = instance->hub_descriptor_size;
-                break;
+                TRANSFER_END_DATA(request, instance->descriptors.hub,
+                    instance->hub_descriptor_size);
 
         case USB_DESCTYPE_DEVICE:
                 usb_log_debug2("USB_DESCTYPE_DEVICE\n");
-                /* Device descriptor is shared (No one should ask for it)*/
-                descriptor = &ohci_rh_device_descriptor;
-                size = sizeof(ohci_rh_device_descriptor);
-                break;
+                /* Device descriptor is shared (No one should ask for it) */
+                TRANSFER_END_DATA(request, &ohci_rh_device_descriptor,
+                    sizeof(ohci_rh_device_descriptor));
 
         case USB_DESCTYPE_CONFIGURATION:
@@ -474 +470 @@
                 /* Start with configuration and add others depending on
                  * request size */
-                descriptor = &instance->descriptors;
-                size = instance->descriptors.configuration.total_length;
-                break;
+                TRANSFER_END_DATA(request, &instance->descriptors,
+                    instance->descriptors.configuration.total_length);
 
         case USB_DESCTYPE_INTERFACE:
@@ -482 +477 @@
                 /* Use local interface descriptor. There is one and it
                  * might be modified */
-                descriptor = &instance->descriptors.interface;
-                size = sizeof(instance->descriptors.interface);
-                break;
+                TRANSFER_END_DATA(request, &instance->descriptors.interface,
+                    sizeof(instance->descriptors.interface));
 
         case USB_DESCTYPE_ENDPOINT:
@@ -490 +484 @@
                  * it might have max_packet_size field modified*/
                 usb_log_debug2("USB_DESCTYPE_ENDPOINT\n");
-                descriptor = &instance->descriptors.endpoint;
-                size = sizeof(instance->descriptors.endpoint);
-                break;
+                TRANSFER_END_DATA(request, &instance->descriptors.endpoint,
+                    sizeof(instance->descriptors.endpoint));
 
         default:
@@ -504 +497 @@
                 TRANSFER_END(request, EINVAL);
         }
-        if (request->buffer_size < size) {
-                size = request->buffer_size;
-        }
-
-        TRANSFER_END_DATA(request, descriptor, size);
+
+        TRANSFER_END(request, ENOTSUP);
 }
 /*----------------------------------------------------------------------------*/