Changeset ec6766a in mainline

Timestamp:

2013-07-27T08:30:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3cc55b47

Parents:

8a23fef

Message:

libusbhost: Remove speed argument from add_ep.

It can be queried internally.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• src/ddf_helpers.c (modified) (1 diff)
• src/hcd.c (modified) (1 diff)
• src/usb_endpoint_manager.c (modified) (2 diffs)

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

@@ -92 +92 @@
 int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size,
-    size_t data_size, ep_add_callback_t callback, void *arg);
+    usb_transfer_type_t type, size_t max_packet_size, size_t data_size,
+    ep_add_callback_t callback, void *arg);
 
 int usb_endpoint_manager_remove_ep(usb_endpoint_manager_t *instance,

uspace/lib/usbhost/src/ddf_helpers.c

@@ -422 +422 @@
 
         /* Add default pipe on default address */
-        ret = hcd_add_ep(hcd, 
+        ret = hcd_add_ep(hcd,
             default_target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
             CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE);

uspace/lib/usbhost/src/hcd.c

@@ -133 +133 @@
 {
         assert(hcd);
-        usb_speed_t speed = USB_SPEED_MAX;
-        const int ret = usb_endpoint_manager_get_info_by_address(
-            &hcd->ep_manager, target.address, &speed);
-        if (ret != EOK) {
-                return ret;
-        }
         return usb_endpoint_manager_add_ep(&hcd->ep_manager, target.address,
-            target.endpoint, dir, type, speed, max_packet_size, size,
-            register_helper, hcd);
+            target.endpoint, dir, type, max_packet_size, size, register_helper,
+            hcd);
 }
 

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -286 +286 @@
 int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size,
-    size_t data_size, ep_add_callback_t callback, void *arg)
+    usb_transfer_type_t type, size_t max_packet_size, size_t data_size,
+    ep_add_callback_t callback, void *arg)
 {
         assert(instance);
         if (instance->bw_count == NULL)
                 return ENOTSUP;
-        if (address < 0)
-                return EINVAL;
-
-        const size_t bw =
-            instance->bw_count(speed, type, data_size, max_packet_size);
-
-        fibril_mutex_lock(&instance->guard);
-        /* Check for available bandwidth */
-        if (bw > instance->free_bw) {
-                fibril_mutex_unlock(&instance->guard);
-                return ENOSPC;
+        if (!usb_address_is_valid(address))
+                return EINVAL;
+
+
+        fibril_mutex_lock(&instance->guard);
+        /* Check for speed and address */
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOENT;
         }
 
@@ -310 +308 @@
                 fibril_mutex_unlock(&instance->guard);
                 return EEXISTS;
+        }
+
+        const usb_speed_t speed = instance->devices[address].speed;
+        const size_t bw =
+            instance->bw_count(speed, type, data_size, max_packet_size);
+
+        /* Check for available bandwidth */
+        if (bw > instance->free_bw) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOSPC;
         }