Changes in uspace/drv/ohci/iface.c [592369ae:a19a2d7] in mainline

File:

• uspace/drv/ohci/iface.c (modified) (14 diffs)

uspace/drv/ohci/iface.c

@@ -55 +55 @@
 
         size_t res_bw;
-        endpoint_t *ep = hc_get_endpoint(*hc,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&(*hc)->ep_manager,
             target.address, target.endpoint, direction, &res_bw);
         if (ep == NULL) {
@@ -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(
@@ -158 +157 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-
+        if (address == hc->rh.address)
+                return EOK;
         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
         if (speed >= USB_SPEED_MAX) {
                 speed = ep_speed;
         }
-        const size_t size = max_packet_size;
+        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",
@@ -169 +183 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        return hc_add_endpoint(hc, address, endpoint, speed, transfer_type,
-            direction, max_packet_size, size, interval);
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
 }
 /*----------------------------------------------------------------------------*/
@@ -181 +198 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
-        return hc_remove_endpoint(hc, address, endpoint, direction);
+        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
+            endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/
@@ -213 +231 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -247 +265 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -281 +299 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -315 +333 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -331 +349 @@
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
- * @param[in] setup_size Size of @p setup_packet buffer in bytes.
+ * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
  * @param[in] data_buffer Data buffer (in USB endianess, allocated and
  *      deallocated by the caller).
- * @param[in] size Size of @p data_buffer buffer in bytes.
+ * @param[in] data_buffer_size Size of @p data_buffer buffer in bytes.
  * @param[in] callback Callback to be issued once the transfer is complete.
  * @param[in] arg Pass-through argument to the callback.
@@ -355 +373 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;
@@ -371 +389 @@
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
- * @param[in] setup_size Size of @p setup_packet buffer in bytes.
+ * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
  * @param[in] data_buffer Buffer where to store the data (in USB endianess,
  *      allocated and deallocated by the caller).
- * @param[in] size Size of @p data_buffer buffer in bytes.
+ * @param[in] data_buffer_size Size of @p data_buffer buffer in bytes.
  * @param[in] callback Callback to be issued once the transfer is complete.
  * @param[in] arg Pass-through argument to the callback.
@@ -394 +412 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                usb_transfer_batch_dispose(batch);
+                batch_dispose(batch);
         }
         return ret;