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

Timestamp:

2011-04-14T07:54:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (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 from development

File:

• uspace/drv/ohci/iface.c (modified) (12 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) {
@@ -164 +164 @@
         }
         const size_t size = max_packet_size;
-        int ret;
 
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
@@ -170 +169 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        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;
+        return hc_add_endpoint(hc, address, endpoint, speed, transfer_type,
+            direction, max_packet_size, size, interval);
 }
 /*----------------------------------------------------------------------------*/
@@ -195 +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);
 }
 /*----------------------------------------------------------------------------*/
@@ -228 +213 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -262 +247 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -296 +281 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -330 +315 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -346 +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.
@@ -370 +355 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -386 +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.
@@ -409 +394 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;