Changeset d8b275d in mainline for uspace/drv/ohci/iface.c

Timestamp:

2011-04-14T08:24:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

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

uspace/drv/ohci/iface.c

@@ -55 +55 @@
 
         size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&(*hc)->ep_manager,
+        endpoint_t *ep = hc_get_endpoint(*hc,
             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);
@@ -68 +71 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    name, target.address, target.endpoint, bw, res_bw);
+                    target.address, target.endpoint, name, 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(
@@ -157 +158 @@
         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 =
-            (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;
-        }
+        const size_t size = max_packet_size;
 
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
@@ -183 +169 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
-        if (ret != EOK) {
-                endpoint_destroy(ep);
-        }
-        return ret;
+        return hc_add_endpoint(hc, address, endpoint, speed, transfer_type,
+            direction, max_packet_size, size, interval);
 }
 /*----------------------------------------------------------------------------*/
@@ -198 +181 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
-        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
-            endpoint, direction);
+        return hc_remove_endpoint(hc, address, endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/
@@ -231 +213 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -265 +247 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -299 +281 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -333 +315 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -349 +331 @@
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
- * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
+ * @param[in] setup_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] data_buffer_size Size of @p data_buffer buffer in bytes.
+ * @param[in] 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.
@@ -373 +355 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -389 +371 @@
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
- * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
+ * @param[in] setup_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] data_buffer_size Size of @p data_buffer buffer in bytes.
+ * @param[in] 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.
@@ -412 +394 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;