Changeset 1e70157 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-06T19:52:17Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8dc762e0

Parents:

fb8927d

Message:

Header fixes, add qh to endpoint structure, add endpoint toggle reset

File:

• uspace/drv/uhci-hcd/iface.c (modified) (4 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -160 +160 @@
             usb_device_keeper_get_speed(&hc->manager, address);
         const size_t size = max_packet_size;
+        int ret;
 
         endpoint_t *ep = malloc(sizeof(endpoint_t));
         if (ep == NULL)
                 return ENOMEM;
-        endpoint_init(ep, transfer_type, speed, max_packet_size);
+        ret = endpoint_init(ep, transfer_type, speed, max_packet_size);
+        if (ret != EOK) {
+                free(ep);
+                return ret;
+        }
 
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
@@ -176 +181 @@
             0;
 
-        int ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
             address, endpoint, direction, ep, endpoint_destroy, bw);
         if (ret != EOK) {
                 endpoint_destroy(ep);
+        } else {
+                usb_device_keeper_add_ep(&hc->manager, address, &ep->same_device_eps);
         }
         return ret;
@@ -345 +352 @@
         assert(ep->transfer_type == USB_TRANSFER_BULK);
 
-
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
@@ -394 +400 @@
 
         usb_transfer_batch_t *batch =
-            batch_get(fun, target, ep->transfer_type, ep->max_packet_size, ep->speed,
-                data, size, NULL, 0, callback, NULL, arg, &hc->manager);
+            batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
+                ep->speed, data, size, NULL, 0, callback, NULL, arg,
+                &hc->manager);
         if (!batch)
                 return ENOMEM;