Changeset 20a3465 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/usbhost/src/iface.c (modified) (10 diffs)

uspace/lib/usbhost/src/iface.c

@@ -49 +49 @@
         assert(hcd);
 
-        int ret;
-
-        size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&hcd->ep_manager,
-            target.address, target.endpoint, direction, &res_bw);
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&hcd->ep_manager,
+            target.address, target.endpoint, direction);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for %s.\n",
@@ -65 +62 @@
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
-        if (res_bw < bw) {
+        /* Check if we have enough bandwidth reserved */
+        if (ep->bandwidth < bw) {
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    target.address, target.endpoint, name, bw, res_bw);
+                    ep->address, ep->endpoint, name, bw, ep->bandwidth);
                 return ENOSPC;
         }
@@ -78 +76 @@
         /* No private data and no private data dtor */
         usb_transfer_batch_t *batch =
-            usb_transfer_batch_get(ep, data, size, setup_data,
+            usb_transfer_batch_create(ep, data, size, setup_data,
             in, out, arg, fun, NULL, NULL);
         if (!batch) {
@@ -84 +82 @@
         }
 
-        ret = hcd->schedule(hcd, batch);
+        const int ret = hcd->schedule(hcd, batch);
         if (ret != EOK)
-                usb_transfer_batch_dispose(batch);
+                usb_transfer_batch_destroy(batch);
 
         return ret;
@@ -130 +128 @@
 
         usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        usb_device_manager_bind(&hcd->dev_manager, address, handle);
-        return EOK;
+        return usb_device_manager_bind(&hcd->dev_manager, address, handle);
 }
 /*----------------------------------------------------------------------------*/
@@ -147 +144 @@
         hcd_t *hcd = fun_to_hcd(fun);
         assert(hcd);
-        const bool found =
-            usb_device_manager_find_by_address(&hcd->dev_manager, address, handle);
-        return found ? EOK : ENOENT;
+        return usb_device_manager_get_info_by_address(
+            &hcd->dev_manager, address, handle, NULL);
 }
 /*----------------------------------------------------------------------------*/
@@ -166 +162 @@
         usb_device_manager_release(&hcd->dev_manager, address);
         return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int register_helper(endpoint_t *ep, void *arg)
+{
+        hcd_t *hcd = arg;
+        assert(ep);
+        assert(hcd);
+        if (hcd->ep_add_hook)
+                return hcd->ep_add_hook(hcd, ep);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static void unregister_helper(endpoint_t *ep, void *arg)
+{
+        hcd_t *hcd = arg;
+        assert(ep);
+        assert(hcd);
+        if (hcd->ep_remove_hook)
+                hcd->ep_remove_hook(hcd, ep);
 }
 /*----------------------------------------------------------------------------*/
@@ -180 +195 @@
         /* Default address is not bound or registered,
          * thus it does not provide speed info. */
-        const usb_speed_t speed = (address == 0) ? ep_speed :
-            usb_device_manager_get_speed(&hcd->dev_manager, address);
+        usb_speed_t speed = ep_speed;
+        /* NOTE The function will return EINVAL and won't
+         * touch speed variable for default address */
+        usb_device_manager_get_info_by_address(
+            &hcd->dev_manager, address, NULL, &speed);
 
         usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
@@ -188 +206 @@
             max_packet_size, interval);
 
-        endpoint_t *ep = endpoint_get(
-            address, endpoint, direction, transfer_type, speed, max_packet_size);
-        if (!ep)
-                return ENOMEM;
-        int ret = EOK;
-
-        if (hcd->ep_add_hook) {
-                ret = hcd->ep_add_hook(hcd, ep);
-        }
-        if (ret != EOK) {
-                endpoint_destroy(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(&hcd->ep_manager, ep, size);
-        if (ret != EOK) {
-                endpoint_destroy(ep);
-        }
-        return ret;
+        return usb_endpoint_manager_add_ep(&hcd->ep_manager, address, endpoint,
+            direction, transfer_type, speed, max_packet_size, size,
+            register_helper, hcd);
 }
 /*----------------------------------------------------------------------------*/
@@ -218 +220 @@
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
             address, endpoint, usb_str_direction(direction));
-        return usb_endpoint_manager_unregister_ep(&hcd->ep_manager, address,
-            endpoint, direction);
+        return usb_endpoint_manager_remove_ep(&hcd->ep_manager, address,
+            endpoint, direction, unregister_helper, hcd);
 }
 /*----------------------------------------------------------------------------*/