Changeset 2963a0d in mainline

Timestamp:

2011-12-06T21:04:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

481dec00

Parents:

b6bade0

Message:

ohci, root hub: Implement standard device GET_STATUS requests.

File:

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

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

@@ -100 +100 @@
         .attributes = USB_TRANSFER_INTERRUPT,
         .descriptor_type = USB_DESCTYPE_ENDPOINT,
-        .endpoint_address = 1 + (1 << 7),
+        .endpoint_address = 1 | (1 << 7),
         .length = sizeof(usb_standard_endpoint_descriptor_t),
         .max_packet_size = 2,
@@ -428 +428 @@
                         TRANSFER_END_DATA(request, &data, sizeof(data));
                 }
+        case SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE):
+                if (request->buffer_size < 2) {
+                        usb_log_error("Buffer(%zu) too small for hub generic "
+                            "get status request.\n", request->buffer_size);
+                        TRANSFER_END(request, EOVERFLOW);
+                } else {
+                        static const uint16_t data =
+                            uint16_host2usb(USB_DEVICE_STATUS_SELF_POWERED);
+                        TRANSFER_END_DATA(request, &data, sizeof(data));
+                }
+
+        case SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE):
+                /* Hubs are allowed to have only one interface */
+                if (request_packet->index != 0)
+                        TRANSFER_END(request, EINVAL);
+                /* Fall through, as the answer will be the same: 0x0000 */
+        case SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_ENDPOINT):
+                /* Endpoint 0 (default control) and 1 (interrupt) */
+                if (request_packet->index >= 2)
+                        TRANSFER_END(request, EINVAL);
+
+                if (request->buffer_size < 2) {
+                        usb_log_error("Buffer(%zu) too small for hub generic "
+                            "get status request.\n", request->buffer_size);
+                        TRANSFER_END(request, EOVERFLOW);
+                } else {
+                        /* Endpoints are OK. (We don't halt) */
+                        static const uint16_t data = 0;
+                        TRANSFER_END_DATA(request, &data, sizeof(data));
+                }
+
         default:
                 usb_log_error("Unsupported GET_STATUS request.\n");