Changeset d09791e6 in mainline

Timestamp:

2012-12-20T15:40:23Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a720ff6

Parents:

d9b2c73

Message:

libusb: Add additional parameter to hcd_setup_device.

uhci will need to know hc function handle.

Location:

uspace

Files:

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

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

@@ -117 +117 @@
             "Failed to register irq handler: %s.\n", str_error(ret));
 
-
         /* Try to enable interrupts */
         bool interrupts = false;
@@ -131 +130 @@
         }
 
-        ret = hcd_setup_device(device);
+        /* Initialize generic HCD driver */
+        ret = hcd_setup_device(device, NULL);
         if (ret != EOK) {
                 unregister_interrupt_handler(device, irq);
@@ -138 +138 @@
 
 
-// TODO: Undo device_setup_hcd
+// TODO: Undo hcd_setup_device
 #define CHECK_RET_CLEAN_RETURN(ret, message...) \
 if (ret != EOK) { \
@@ -147 +147 @@
         hc_t *hc_impl = malloc(sizeof(hc_t));
         ret = hc_impl ? EOK : ENOMEM;
-        CHECK_RET_CLEAN_RETURN(ret, "Failed to aloocate driver structure.\n");
+        CHECK_RET_CLEAN_RETURN(ret, "Failed to allocate driver structure.\n");
 
+        /* Initialize OHCI HC */
         ret = hc_init(hc_impl, reg_base, reg_size, interrupts);
         CHECK_RET_CLEAN_RETURN(ret, "Failed to init hc: %s.\n", str_error(ret));
 
+        /* Connect OHCI to generic HCD */
         hcd_set_implementation(dev_to_hcd(device), hc_impl,
             hc_schedule, ohci_endpoint_init, ohci_endpoint_fini);
+
+        /* HC should be running OK. We can add root hub */
         ret = hcd_setup_hub(dev_to_hcd(device), &hc_impl->rh.address, device);
         CHECK_RET_CLEAN_RETURN(ret,

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

@@ -107 +107 @@
     const match_id_list_t *mids);
 
-int hcd_setup_device(ddf_dev_t *device);
+int hcd_setup_device(ddf_dev_t *device, ddf_fun_t **fun);
 int hcd_setup_hub(hcd_t *instance, usb_address_t *address, ddf_dev_t *dev);
 

uspace/lib/usbhost/src/hcd.c

@@ -307 +307 @@
  *  - registers interrupt handler
  */
-int hcd_setup_device(ddf_dev_t *device)
+int hcd_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun)
 {
         if (device == NULL)
@@ -355 +355 @@
 
         /* HC should be ok at this point (except it can't do anything) */
+        if (hc_fun)
+                *hc_fun = instance->hc_fun;
 
         return EOK;