Changeset 23b0fe8 in mainline

Timestamp:

2011-08-25T13:16:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e20eaed

Parents:

90dd59d

Message:

libusbhost,uhci,ohci: Remove batch init hook.

Hw specific inintialization is a part of the scheduling process.

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/hc.c (modified) (2 diffs)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/src/iface.c (modified) (2 diffs)

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

@@ -203 +203 @@
         instance->generic.private_data = instance;
         instance->generic.schedule = schedule;
-        instance->generic.batch_init_hook = batch_init_ohci;
         instance->generic.ep_add_hook = NULL;
 

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

@@ -198 +198 @@
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
-        instance->generic.batch_init_hook = batch_init_uhci;
         instance->generic.ep_add_hook = NULL;
+
 #undef CHECK_RET_DEST_FUN_RETURN
 
@@ -382 +382 @@
         assert(instance);
         assert(batch);
+        int ret = batch_init_uhci(batch);
+        if (ret != EOK) {
+                return ret;
+        }
 
         transfer_list_t *list =

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

@@ -51 +51 @@
         int (*schedule)(hcd_t *, usb_transfer_batch_t *);
         int (*ep_add_hook)(hcd_t *, endpoint_t *);
-        int (*batch_init_hook)(usb_transfer_batch_t *);
 };
 /*----------------------------------------------------------------------------*/

uspace/lib/usbhost/src/iface.c

@@ -78 +78 @@
         }
 
-        /* No private data and no private data_dtor, these should be set by
-         * batch_init_hook*/
+        /* No private data and no private data dtor, these will be set later */
         usb_transfer_batch_init(batch, ep, data, NULL, size, setup_data,
             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");
-        }
+
         if (hcd->schedule) {
                 ret = hcd->schedule(hcd, batch);
@@ -204 +197 @@
                 return ENOMEM;
         int ret = EOK;
+
         if (hcd->ep_add_hook) {
-                ret = hcd->ep_add_hook(ep);
+                ret = hcd->ep_add_hook(hcd, ep);
         }
         if (ret != EOK) {