Changeset 48ae3ef in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2011-10-28T21:52:15Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57e06ef

Parents:

7265558

Message:

libusbhost: Make interfaces more symmetric.

Make usb_endpoint_manager interface easier to use and understand.
Move ep removal hook pointer from endpoint_t to hcd_t.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (3 diffs)
• ohci_endpoint.c (modified) (2 diffs)
• ohci_endpoint.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/hc.c

@@ -142 +142 @@
 if (ret != EOK) { \
         usb_log_error(message); \
-        usb_endpoint_manager_unregister_ep( \
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\
+        usb_endpoint_manager_remove_ep( \
+            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH, \
+            NULL, NULL);\
         usb_device_manager_release( \
             &instance->generic.dev_manager, hub_address); \
@@ -150 +151 @@
         int ret = usb_endpoint_manager_add_ep(
             &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH,
-            USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0);
+            USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0, NULL, NULL);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to register root hub control endpoint: %s.\n",
@@ -197 +198 @@
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = ohci_endpoint_init;
+        instance->generic.ep_remove_hook = ohci_endpoint_fini;
 
         ret = hc_init_memory(instance);

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -62 +62 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Disposes hcd endpoint structure
- *
- * @param[in] hcd_ep endpoint structure
- */
-static void ohci_endpoint_fini(endpoint_t *ep)
-{
-        ohci_endpoint_t *instance = ep->hc_data.data;
-        hc_dequeue_endpoint(instance->hcd->private_data, ep);
-        if (instance) {
-                free32(instance->ed);
-                free32(instance->td);
-                free(instance);
-        }
-}
-/*----------------------------------------------------------------------------*/
 /** Creates new hcd endpoint representation.
  *
@@ -104 +89 @@
         ed_init(ohci_ep->ed, ep, ohci_ep->td);
         endpoint_set_hc_data(
-            ep, ohci_ep, ohci_endpoint_fini, ohci_ep_toggle_get, ohci_ep_toggle_set);
+            ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
         ohci_ep->hcd = hcd;
         hc_enqueue_endpoint(hcd->private_data, ep);
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+/** Disposes hcd endpoint structure
+ *
+ * @param[in] hcd_ep endpoint structure
+ */
+void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep)
+{
+        assert(hcd);
+        assert(ep);
+        ohci_endpoint_t *instance = ohci_endpoint_get(ep);
+        hc_dequeue_endpoint(hcd->private_data, ep);
+        if (instance) {
+                free32(instance->ed);
+                free32(instance->td);
+                free(instance);
+        }
+        endpoint_clear_hc_data(ep);
+}
 /**
  * @}

uspace/drv/bus/usb/ohci/ohci_endpoint.h

@@ -56 +56 @@
 
 int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
+void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
 
 /** Get and convert assigned ohci_endpoint_t structure