Changeset 395bb79 in mainline

Timestamp:

2012-12-16T18:17:20Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4bfe063

Parents:

f51587f5

Message:

ohci: Decouple OHCI from generic hcd.

Location:

uspace/drv/bus/usb/ohci

Files:

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

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

@@ -51 +51 @@
 /** Main OHCI driver structure */
 typedef struct hc {
-        /** Generic USB hc driver */
-        hcd_t generic;
-
         /** Memory mapped I/O registers area */
         ohci_regs_t *registers;

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

@@ -187 +187 @@
             "Failed to create OHCI HC function: %s.\n", str_error(ret));
         ddf_fun_set_ops(instance->hc_fun, &hc_ops);
-        hc_t *hc = ddf_fun_data_alloc(instance->hc_fun, sizeof(hc_t));
-        ret = hc ? EOK : ENOMEM;
+        hcd_t *hcd = ddf_fun_data_alloc(instance->hc_fun, sizeof(hcd_t));
+        ret = hcd ? EOK : ENOMEM;
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to allocate HCD structure: %s.\n", str_error(ret));
 
-        hcd_init(&hc->generic, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+        hcd_init(hcd, USB_SPEED_FULL, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
+
+        ret = ddf_fun_bind(instance->hc_fun);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to bind OHCI device function: %s.\n", str_error(ret));
+
+        ret = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to add OHCI to HC class: %s.\n", str_error(ret));
+
+        /* HC should be ok at this point (except it can't do anything) */
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh");
@@ -227 +237 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to generate IRQ code: %s.\n", str_error(ret));
-
 
         /* Register handler to avoid interrupt lockup */
@@ -247 +256 @@
         }
 
-        ret = hc_init(hc, reg_base, reg_size, interrupts);
+        hc_t *hc_impl = malloc(sizeof(hc_t));
+        assert(hc_impl);
+
+        ret = hc_init(hc_impl, reg_base, reg_size, interrupts);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to init ohci_hcd: %s.\n", str_error(ret));
 
-        hcd_set_implementation(&hc->generic, hc, hc_schedule,
+        hcd_set_implementation(hcd, hc_impl, hc_schedule,
             ohci_endpoint_init, ohci_endpoint_fini);
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \
-        hc_fini(hc); \
+        hc_fini(hc_impl); \
         unregister_interrupt_handler(device, irq); \
         CHECK_RET_DEST_FREE_RETURN(ret, message); \
 } else (void)0
 
-
-        ret = ddf_fun_bind(instance->hc_fun);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed to bind OHCI device function: %s.\n", str_error(ret));
-
-        ret = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed to add OHCI to HC class: %s.\n", str_error(ret));
-
-        ret = hcd_register_hub(&hc->generic, &hc->rh.address, instance->rh_fun);
+        ret = hcd_register_hub(hcd, &hc_impl->rh.address, instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));