Changes in uspace/drv/uhci-hcd/iface.c [2cc6e97:0ede0c3] in mainline

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -148 +148 @@
         assert(hc);
         const size_t size = max_packet_size;
+        int ret;
         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
         if (speed >= USB_SPEED_MAX) {
@@ -156 +157 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        return usb_endpoint_manager_add_ep(&hc->ep_manager, address, endpoint,
-            direction, transfer_type, speed, max_packet_size, size);
+
+        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        if (ep == NULL)
+                return ENOMEM;
+        ret = endpoint_init(ep, address, endpoint, direction,
+            transfer_type, speed, max_packet_size);
+        if (ret != EOK) {
+                free(ep);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
 }
 /*----------------------------------------------------------------------------*/
@@ -195 +210 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -223 +238 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -251 +266 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -279 +294 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -312 +327 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -344 +359 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;