Changeset 933b0d7 in mainline

Timestamp:

2011-09-07T11:38:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d394f1b8

Parents:

7099861

Message:

USB: make bandwidth count function changeable

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_endpoint_manager.h (modified) (2 diffs)
• lib/usbhost/src/usb_endpoint_manager.c (modified) (2 diffs)

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

@@ -188 +188 @@
         list_initialize(&instance->pending_batches);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
+        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
         CHECK_RET_RETURN(ret, "Failed to initialize generic driver: %s.\n",
             str_error(ret));

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

@@ -192 +192 @@
             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
+        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
         CHECK_RET_RETURN(ret, "Failed to initialize HCD generic driver: %s.\n",
             str_error(ret));

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

@@ -73 +73 @@
         }
         data->magic = 0xDEADBEEF;
-        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1);
+        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1,
+            bandwidth_count_usb11);
         if (rc != EOK) {
                 usb_log_fatal("Failed to initialize endpoint manager.\n");

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

@@ -53 +53 @@
 };
 /*----------------------------------------------------------------------------*/
-static inline int hcd_init(hcd_t *hcd, size_t bandwidth)
+static inline int hcd_init(hcd_t *hcd, size_t bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
 {
         assert(hcd);
         usb_device_keeper_init(&hcd->dev_manager);
-        return usb_endpoint_manager_init(&hcd->ep_manager, bandwidth);
+        return usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
 }
 /*----------------------------------------------------------------------------*/

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

@@ -53 +53 @@
         fibril_mutex_t guard;
         size_t free_bw;
+        size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
 } usb_endpoint_manager_t;
 
@@ -59 +60 @@
 
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth);
+    size_t available_bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t));
 
 void usb_endpoint_manager_destroy(usb_endpoint_manager_t *instance);

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -140 +140 @@
 /*----------------------------------------------------------------------------*/
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth)
+    size_t available_bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
 {
         assert(instance);
         fibril_mutex_initialize(&instance->guard);
         instance->free_bw = available_bandwidth;
+        instance->bw_count = bw_count;
         const bool ht =
             hash_table_create(&instance->ep_table, BUCKET_COUNT, MAX_KEYS, &op);
@@ -158 +160 @@
     endpoint_t *ep, size_t data_size)
 {
+        assert(instance);
+        assert(instance->bw_count);
         assert(ep);
-        const size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+        const size_t bw = instance->bw_count(ep->speed, ep->transfer_type,
             data_size, ep->max_packet_size);
-        assert(instance);
 
         fibril_mutex_lock(&instance->guard);