Changeset e65cd3c4 in mainline

Timestamp:

2011-12-06T15:15:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9babc17

Parents:

2f80b86

Message:

ohci, root hub: Only check buffer size for hub specific GET_STATUS.

TODO Implement standard USB GET_STATUS requests.

File:

• uspace/drv/bus/usb/ohci/root_hub.c (modified) (1 diff)

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

@@ -393 +393 @@
         assert(request);
 
-        if (request->buffer_size < 4) {
-                usb_log_error("Buffer too small for get status request.\n");
-                TRANSFER_END(request, EOVERFLOW);
-        }
 
         const usb_device_request_setup_packet_t *request_packet =
             (usb_device_request_setup_packet_t*)request->setup_buffer;
 
+        switch (request_packet->request_type)
+        {
+        case USB_HUB_REQ_TYPE_GET_HUB_STATUS:
         /* Hub status: just filter relevant info from rh_status reg */
-        if (request_packet->request_type == USB_HUB_REQ_TYPE_GET_HUB_STATUS) {
-                const uint32_t data = instance->registers->rh_status &
-                    (RHS_LPS_FLAG | RHS_LPSC_FLAG | RHS_OCI_FLAG | RHS_OCIC_FLAG);
-                TRANSFER_END_DATA(request, &data, sizeof(data));
-        }
+                if (request->buffer_size < 4) {
+                        usb_log_error("Buffer(%zu) too small for hub get "
+                            "status request.\n", request->buffer_size);
+                        TRANSFER_END(request, EOVERFLOW);
+                } else {
+                        const uint32_t data = instance->registers->rh_status &
+                            (RHS_LPS_FLAG | RHS_LPSC_FLAG
+                                | RHS_OCI_FLAG | RHS_OCIC_FLAG);
+                        TRANSFER_END_DATA(request, &data, sizeof(data));
+                }
 
         /* Copy appropriate rh_port_status register, OHCI designers were
          * kind enough to make those bit values match USB specification */
-        if (request_packet->request_type == USB_HUB_REQ_TYPE_GET_PORT_STATUS) {
-                const unsigned port = request_packet->index;
-                if (port < 1 || port > instance->port_count)
-                        TRANSFER_END(request, EINVAL);
-
-                const uint32_t data =
-                    instance->registers->rh_port_status[port - 1];
-                TRANSFER_END_DATA(request, &data, sizeof(data));
-        }
-
-        TRANSFER_END(request, ENOTSUP);
+        case USB_HUB_REQ_TYPE_GET_PORT_STATUS:
+                if (request->buffer_size < 4) {
+                        usb_log_error("Buffer(%zu) too small for hub get "
+                            "status request.\n", request->buffer_size);
+                        TRANSFER_END(request, EOVERFLOW);
+                } else {
+                        const unsigned port = request_packet->index;
+                        if (port < 1 || port > instance->port_count)
+                                TRANSFER_END(request, EINVAL);
+
+                        const uint32_t data =
+                            instance->registers->rh_port_status[port - 1];
+                        TRANSFER_END_DATA(request, &data, sizeof(data));
+                }
+        default:
+                usb_log_error("Unsupported GET_STATUS request.\n");
+                TRANSFER_END(request, ENOTSUP);
+        }
+
 }
 /*----------------------------------------------------------------------------*/