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

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -63 +63 @@
         }
 
-        usb_log_debug("%s %d:%d %zu(%zu).\n",
-            name, target.address, target.endpoint, size, ep->max_packet_size);
-
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
@@ -71 +68 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    target.address, target.endpoint, name, bw, res_bw);
+                    name, target.address, target.endpoint, bw, res_bw);
                 return ENOSPC;
         }
+        usb_log_debug("%s %d:%d %zu(%zu).\n",
+            name, target.address, target.endpoint, size, ep->max_packet_size);
 
         *batch = batch_get(
@@ -147 +146 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        const size_t size = max_packet_size;
         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
         if (speed >= USB_SPEED_MAX) {
                 speed = ep_speed;
         }
+        const size_t size =
+            (transfer_type == USB_TRANSFER_INTERRUPT
+            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
+            max_packet_size : 0;
+        int ret;
+
+        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;
+        }
+
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
             address, endpoint, usb_str_transfer_type(transfer_type),
             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);
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
 }
 /*----------------------------------------------------------------------------*/
@@ -195 +212 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -223 +240 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -251 +268 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -279 +296 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -312 +329 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -344 +361 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;