Changeset 6bb0f43 in mainline

Timestamp:

2011-04-13T10:36:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2759c52

Parents:

3d932af6

Message:

Move endpoint registration to hc.c

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (2 diffs)
• iface.c (modified) (5 diffs)

uspace/drv/ohci/hc.c

@@ -130 +130 @@
                 fibril_add_ready(instance->interrupt_emulator);
         }
-
+#undef CHECK_RET_RETURN
         return EOK;
+}
+/*----------------------------------------------------------------------------*/
+int hc_add_endpoint(
+    hc_t *instance, usb_address_t address, usb_endpoint_t endpoint,
+    usb_speed_t speed, usb_transfer_type_t type, usb_direction_t direction,
+    size_t mps, size_t size, unsigned interval)
+{
+        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        if (ep == NULL)
+                return ENOMEM;
+        int ret =
+            endpoint_init(ep, address, endpoint, direction, type, speed, mps);
+        if (ret != EOK) {
+                free(ep);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+int hc_remove_endpoint(hc_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction)
+{
+        return usb_endpoint_manager_unregister_ep(&instance->ep_manager,
+            address, endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hc.h

@@ -77 +77 @@
      uintptr_t regs, size_t reg_size, bool interrupts);
 
-int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
-
-void hc_interrupt(hc_t *instance, uint32_t status);
-
 /** Safely dispose host controller internal structures
  *
@@ -86 +82 @@
  */
 static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
+
+int hc_add_endpoint(hc_t *instance, usb_address_t address, usb_endpoint_t ep,
+    usb_speed_t speed, usb_transfer_type_t type, usb_direction_t direction,
+                size_t max_packet_size, size_t size, unsigned interval);
+
+int hc_remove_endpoint(hc_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction);
+
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
+
+void hc_interrupt(hc_t *instance, uint32_t status);
 
 /** Get and cast pointer to the driver data

uspace/drv/ohci/iface.c

@@ -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);
 }
 /*----------------------------------------------------------------------------*/
@@ -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.
@@ -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.