Changeset 2a5a7711 in mainline

Timestamp:

2013-02-08T16:08:51Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

603a0a4

Parents:

81da273b

Message:

libusbvirt, virthub: Allow drivers to set endpoint number and port count.

Using smaller max_packet_size reduces bandwidth requirements.

Location:

uspace

Files:

• drv/bus/usb/uhci/uhci_rh.c (modified) (2 diffs)
• lib/usbvirt/include/usbvirt/virthub_base.h (modified) (2 diffs)
• lib/usbvirt/src/virthub_base.c (modified) (3 diffs)
• lib/usbvirt/src/virthub_descriptors.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -78 +78 @@
         instance->reset_changed[1] = false;
         return virthub_base_init(&instance->base, name, &ops, instance,
-            NULL, &hub_descriptor.header);
+            NULL, &hub_descriptor.header, HUB_STATUS_CHANGE_PIPE, 2);
 }
 
@@ -376 +376 @@
 
 /** UHCI root hub request handlers */
-static usbvirt_control_request_handler_t control_transfer_handlers[] = {
+static const usbvirt_control_request_handler_t control_transfer_handlers[] = {
         {
                 STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),

uspace/lib/usbvirt/include/usbvirt/virthub_base.h

@@ -42 +42 @@
 enum {
         VIRTHUB_EXTR_DESC = 3,
-        HUB_STATUS_CHANGE_PIPE = 1,
 };
 
 typedef struct {
         usb_standard_configuration_descriptor_t config_descriptor;
+        usb_standard_endpoint_descriptor_t endpoint_descriptor;
         usbvirt_device_configuration_extras_t extra[VIRTHUB_EXTR_DESC];
         usbvirt_device_configuration_t configuration;
@@ -59 +59 @@
     const char *name, usbvirt_device_ops_t *ops, void *data,
     const usb_standard_device_descriptor_t *device_desc,
-    const usb_hub_descriptor_header_t *hub_desc);
+    const usb_hub_descriptor_header_t *hub_desc,
+    usb_endpoint_t ep, unsigned port_count);
 
 usb_address_t virthub_base_get_address(virthub_base_t *instance);

uspace/lib/usbvirt/src/virthub_base.c

@@ -42 +42 @@
 extern const usb_standard_device_descriptor_t virthub_device_descriptor;
 extern const usb_standard_configuration_descriptor_t virthub_configuration_descriptor_without_hub_size;
+extern const usb_standard_endpoint_descriptor_t virthub_endpoint_descriptor;
 extern const usbvirt_device_configuration_extras_t virthub_interface_descriptor_ex;
-extern const usbvirt_device_configuration_extras_t virthub_endpoint_descriptor_ex;
 
 void *virthub_get_data(usbvirt_device_t *dev)
@@ -53 +53 @@
 }
 
-int virthub_base_init(virthub_base_t *instance,
-    const char *name, usbvirt_device_ops_t *ops, void *data,
+int virthub_base_init(virthub_base_t *instance, const char *name,
+    usbvirt_device_ops_t *ops, void *data,
     const usb_standard_device_descriptor_t *device_desc,
-    const usb_hub_descriptor_header_t *hub_desc)
+    const usb_hub_descriptor_header_t *hub_desc,
+    usb_endpoint_t ep, unsigned port_count)
 {
         assert(instance);
         assert(hub_desc);
         assert(name);
+        
+        if (!usb_endpoint_is_valid(ep) || (ep == USB_ENDPOINT_DEFAULT_CONTROL))
+                return EINVAL;
 
         instance->config_descriptor =
             virthub_configuration_descriptor_without_hub_size;
         instance->config_descriptor.total_length += hub_desc->length;
+
+        instance->endpoint_descriptor = virthub_endpoint_descriptor;
+        instance->endpoint_descriptor.endpoint_address = 128 | ep;
+        instance->endpoint_descriptor.max_packet_size =
+            (1 + port_count + 7) / 8;
 
         instance->descriptors.device =
@@ -78 +87 @@
         instance->extra[1].data = (void *)hub_desc;
         instance->extra[1].length = hub_desc->length;
-        instance->extra[2] = virthub_endpoint_descriptor_ex;
+        instance->extra[2].data = (void*)&instance->endpoint_descriptor;
+        instance->extra[2].length = sizeof(instance->endpoint_descriptor);
 
         instance->device.ops = ops;

uspace/lib/usbvirt/src/virthub_descriptors.c

@@ -74 +74 @@
         .length = sizeof(usb_standard_endpoint_descriptor_t),
         .descriptor_type = USB_DESCTYPE_ENDPOINT,
-        .endpoint_address = HUB_STATUS_CHANGE_PIPE | 128,
+        .endpoint_address = 1 | 128,
         .attributes = USB_TRANSFER_INTERRUPT,
         .max_packet_size = 8,
@@ -101 +101 @@
 };
 
-const usbvirt_device_configuration_extras_t virthub_endpoint_descriptor_ex = {
-        .data = (uint8_t *) &virthub_endpoint_descriptor,
-        .length = sizeof(virthub_endpoint_descriptor),
-};
-
 
 /**