Changeset 83c3123 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2011-10-27T11:40:06Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7265558

Parents:

4267908

Message:

libusbhost: Store bandwidth in endpoint structure.

Remove redundant node_t tructure and use endpoint_t directly.

File:

• uspace/lib/usbhost/src/iface.c (modified) (4 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);
+            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;
         }
@@ -84 +82 @@
         }
 
-        ret = hcd->schedule(hcd, batch);
+        const int ret = hcd->schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_dispose(batch);
@@ -190 +188 @@
             max_packet_size, interval);
 
-        endpoint_t *ep = endpoint_get(
-            address, endpoint, direction, transfer_type, speed, max_packet_size);
+        endpoint_t *ep =
+            endpoint_create(address, endpoint, direction, transfer_type,
+                speed, max_packet_size, 0);
         if (!ep)
                 return ENOMEM;