Changeset 5e07cbc0 in mainline

Timestamp:

2011-10-31T13:39:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0cd8089

Parents:

27ed734c

Message:

libusbhost: usb_device_manager: Add speed limit.

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/hc.c (modified) (1 diff)
• drv/bus/usb/vhc/main.c (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/include/usb/host/usb_device_manager.h (modified) (2 diffs)
• lib/usbhost/src/usb_device_manager.c (modified) (3 diffs)

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

@@ -193 +193 @@
         list_initialize(&instance->pending_batches);
 
-        hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;

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

@@ -199 +199 @@
 #undef CHECK_RET_RETURN
 
-        hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 
         instance->generic.private_data = instance;

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

@@ -80 +80 @@
                 return rc;
         }
-        usb_device_manager_init(&data->dev_manager);
+        usb_device_manager_init(&data->dev_manager, USB_SPEED_MAX);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -68 +68 @@
  * @param bw_count Bandwidth compute function, passed to endpoint manager.
  */
-static inline void hcd_init(hcd_t *hcd, size_t bandwidth,
+static inline void hcd_init(hcd_t *hcd, usb_speed_t max_speed, size_t bandwidth,
     size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
 {
         assert(hcd);
-        usb_device_manager_init(&hcd->dev_manager);
+        usb_device_manager_init(&hcd->dev_manager, max_speed);
         usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
         hcd->private_data = NULL;

uspace/lib/usbhost/include/usb/host/usb_device_manager.h

@@ -59 +59 @@
                 devman_handle_t handle; /**< Devman handle of the device. */
         } devices[USB_ADDRESS_COUNT];
+        usb_speed_t max_speed;
         fibril_mutex_t guard;
         /** The last reserved address */
@@ -64 +65 @@
 } usb_device_manager_t;
 
-void usb_device_manager_init(usb_device_manager_t *instance);
+void usb_device_manager_init(
+    usb_device_manager_t *instance, usb_speed_t max_speed);
 
 usb_address_t usb_device_manager_get_free_address(

uspace/lib/usbhost/src/usb_device_manager.c

@@ -41 +41 @@
  *
  * @param[in] instance Memory place to initialize.
+ * @param[in] max_speed Maximum allowed USB speed of devices (inclusive).
  *
  * Set all values to false/0.
  */
-void usb_device_manager_init(usb_device_manager_t *instance)
+void usb_device_manager_init(
+    usb_device_manager_t *instance, usb_speed_t max_speed)
 {
         assert(instance);
@@ -56 +58 @@
         instance->devices[0].occupied = true;
         instance->last_address = 0;
+        instance->max_speed = max_speed;
         fibril_mutex_initialize(&instance->guard);
 }
@@ -69 +72 @@
 {
         assert(instance);
+        if (speed > instance->max_speed)
+                return ENOTSUP;
         fibril_mutex_lock(&instance->guard);