Changeset bb70637 in mainline for uspace/drv/bus/usb/usbhub

Timestamp:

2013-01-26T23:35:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

35bc430

Parents:

3e23316

Message:

usb: Rework polling to accept either ep numbers or descriptions.

Switch usbhub and usbhid to new polling.

Location:

uspace/drv/bus/usb/usbhub

Files:

• main.c (modified) (1 diff)
• usbhub.c (modified) (2 diffs)
• usbhub.h (modified) (1 diff)

uspace/drv/bus/usb/usbhub/main.c

@@ -43 +43 @@
 #include "usbhub.h"
 
-/** Hub status-change endpoint description.
- *
- * For more information see section 11.15.1 of USB 1.1 specification.
- */
-static const usb_endpoint_description_t hub_status_change_endpoint_description =
-{
-        .transfer_type = USB_TRANSFER_INTERRUPT,
-        .direction = USB_DIRECTION_IN,
-        .interface_class = USB_CLASS_HUB,
-        .interface_subclass = 0,
-        .interface_protocol = 0,
-        .flags = 0
-};
 
 /** USB hub driver operations. */

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -57 +57 @@
 
 #define HUB_FNC_NAME "hub"
+/** Hub status-change endpoint description.
+ *
+ * For more information see section 11.15.1 of USB 1.1 specification.
+ */
+const usb_endpoint_description_t hub_status_change_endpoint_description =
+{
+        .transfer_type = USB_TRANSFER_INTERRUPT,
+        .direction = USB_DIRECTION_IN,
+        .interface_class = USB_CLASS_HUB,
+        .interface_subclass = 0,
+        .interface_protocol = 0,
+        .flags = 0
+};
 
 /** Standard get hub global status request */
@@ -147 +160 @@
 
         /* Start hub operation. */
-        opResult = usb_device_auto_poll(hub_dev->usb_device, 0,
+        opResult = usb_device_auto_poll_desc(hub_dev->usb_device,
+            &hub_status_change_endpoint_description,
             hub_port_changes_callback, ((hub_dev->port_count + 1 + 7) / 8),
-            255000,
-            usb_hub_polling_terminated_callback, hub_dev);
+            -1, usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
                 usb_pipe_end_long_transfer(control_pipe);

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -80 +80 @@
 };
 
+extern const usb_endpoint_description_t hub_status_change_endpoint_description;
+
 int usb_hub_device_add(usb_device_t *usb_dev);
 int usb_hub_device_remove(usb_device_t *usb_dev);