Changeset 1a02517 in mainline for uspace/lib

Timestamp:

2011-08-25T08:53:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

32e093e

Parents:

3afb758

Message:

libusbhost: Streamline new hcd arch. UHCI: follow changes in libusbhost

Add endpoint registration hook.
Remove batch private data dtor from hcd_t (it should be set during initialization)

Location:

uspace/lib/usbhost

Files:

• include/usb/host/hcd.h (modified) (1 diff)
• include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• src/iface.c (modified) (2 diffs)

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -50 +50 @@
 
         int (*schedule)(hcd_t *, usb_transfer_batch_t *);
-        void * (*batch_private_ctor)(usb_transfer_batch_t *);
-        void (*batch_private_dtor)(void *);
+        int (*batch_init_hook)(usb_transfer_batch_t *);
+        int (*ep_add_hook)(endpoint_t *);
 };
 /*----------------------------------------------------------------------------*/

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -77 +77 @@
     usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 
+/** Wrapper combining allocation and insertion */
 static inline int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,

uspace/lib/usbhost/src/iface.c

@@ -78 +78 @@
         }
 
+        /* No private data and no private data_dtor, these should be set by
+         * batch_init_hook*/
         usb_transfer_batch_init(batch, ep, data, NULL, size, setup_data,
-            setup_size, in, out, arg, fun, NULL, hcd->batch_private_dtor);
-        if (hcd->batch_private_ctor) {
-                batch->private_data = hcd->batch_private_ctor(batch);
-                if (!batch->private_data) {
-                        ret = ENOMEM;
+            setup_size, in, out, arg, fun, NULL, NULL);
+        if (hcd->batch_init_hook) {
+                ret = hcd->batch_init_hook(batch);
+                if (ret != EOK)
                         goto out;
-                }
         } else {
                 usb_log_warning("Missing batch_private_data constructor!\n");
@@ -199 +199 @@
             max_packet_size, interval);
 
-        return usb_endpoint_manager_add_ep(&hcd->ep_manager, address, endpoint,
-            direction, transfer_type, speed, max_packet_size, size);
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, transfer_type, speed, max_packet_size);
+        if (!ep)
+                return ENOMEM;
+        int ret = EOK;
+        if (hcd->ep_add_hook) {
+                ret = hcd->ep_add_hook(ep);
+        }
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(&hcd->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
 }
 /*----------------------------------------------------------------------------*/