Changeset 62265ce in mainline

Timestamp:

2011-05-07T14:26:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dc5f2fb

Parents:

7ab7c7f6

Message:

OHCI initialization refactoring

Location:

uspace/drv/ohci

Files:

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

uspace/drv/ohci/hc.c

@@ -95 +95 @@
 }
 /*----------------------------------------------------------------------------*/
-int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
-    uintptr_t regs, size_t reg_size, bool interrupts)
+int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts)
 {
         assert(instance);

uspace/drv/ohci/hc.h

@@ -77 +77 @@
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 
-int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
-     uintptr_t regs, size_t reg_size, bool interrupts);
+int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts);
 
 void hc_start_hw(hc_t *instance);

uspace/drv/ohci/main.c

@@ -69 +69 @@
         }
 
-        int ret = ohci_init(ohci, device);
+        int ret = device_setup_ohci(device, ohci);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver: %s.\n",

uspace/drv/ohci/ohci.c

@@ -127 +127 @@
  *  - registers interrupt handler
  */
-int ohci_init(ohci_t *instance, ddf_dev_t *device)
+int device_setup_ohci(ddf_dev_t *device, ohci_t *instance)
 {
         assert(instance);
-        instance->hc_fun = NULL;
-        instance->rh_fun = NULL;
+
+        instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci-hc");
+        if (instance->hc_fun == NULL) {
+                usb_log_error("Failed to create HC function.\n");
+                return ENOMEM;
+        }
+        instance->hc_fun->ops = &hc_ops;
+        instance->hc_fun->driver_data = &instance->hc;
+
+        instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci-rh");
+        if (instance->rh_fun == NULL) {
+                ddf_fun_destroy(instance->hc_fun);
+                usb_log_error("Failed to create RH function.\n");
+                return ENOMEM;
+        }
+        instance->rh_fun->ops = &rh_ops;
+        instance->rh_fun->driver_data = NULL;
+
 #define CHECK_RET_DEST_FUN_RETURN(ret, message...) \
 if (ret != EOK) { \
         usb_log_error(message); \
-        if (instance->hc_fun) \
-                ddf_fun_destroy(instance->hc_fun); \
-        if (instance->rh_fun) \
-                ddf_fun_destroy(instance->rh_fun); \
+        instance->hc_fun->ops = NULL; \
+        instance->hc_fun->driver_data = NULL; \
+        instance->rh_fun->ops = NULL; \
+        instance->rh_fun->driver_data = NULL; \
+        ddf_fun_destroy(instance->hc_fun); \
+        ddf_fun_destroy(instance->rh_fun); \
         return ret; \
 }
@@ -156 +174 @@
         bool interrupts = false;
 #ifdef CONFIG_USBHC_NO_INTERRUPTS
-        usb_log_warning("Interrupts disabled in OS config, " \
+        usb_log_warning("Interrupts disabled in OS config, "
             "falling back to polling.\n");
 #else
@@ -163 +181 @@
                 usb_log_warning("Failed to enable interrupts: %s.\n",
                     str_error(ret));
-                usb_log_info("HW interrupts not available, " \
+                usb_log_info("HW interrupts not available, "
                     "falling back to polling.\n");
         } else {
@@ -171 +189 @@
 #endif
 
-        instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci-hc");
-        ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
-        CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to create HC function.\n", ret);
-
-        ret = hc_init(&instance->hc, instance->hc_fun, device,
-            mem_reg_base, mem_reg_size, interrupts);
+        ret = hc_init(&instance->hc, mem_reg_base, mem_reg_size, interrupts);
         CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init ohci-hcd.\n", ret);
-        instance->hc_fun->ops = &hc_ops;
-        instance->hc_fun->driver_data = &instance->hc;
-        ret = ddf_fun_bind(instance->hc_fun);
-        CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to bind OHCI device function: %s.\n",
-            ret, str_error(ret));
-#undef CHECK_RET_HC_RETURN
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \
-        usb_log_error(message); \
-        if (instance->hc_fun) \
-                ddf_fun_destroy(instance->hc_fun); \
-        if (instance->rh_fun) \
-                ddf_fun_destroy(instance->rh_fun); \
         hc_fini(&instance->hc); \
-        return ret; \
+        CHECK_RET_DEST_FUN_RETURN(ret, message); \
 }
 
@@ -204 +204 @@
             "Failed(%d) to register interrupt handler.\n", ret);
 
-        instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci-rh");
-        ret = (instance->rh_fun == NULL) ? ENOMEM : EOK;
+        ret = ddf_fun_bind(instance->hc_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to create root hub function.\n", ret);
-
-
-        instance->rh_fun->ops = &rh_ops;
-        instance->rh_fun->driver_data = NULL;
-        
+            "Failed(%d) to bind OHCI device function: %s.\n",
+            ret, str_error(ret));
+
         device->driver_data = instance;
 
         hc_start_hw(&instance->hc);
         return EOK;
+
+#undef CHECK_RET_DEST_FUN_RETURN
 #undef CHECK_RET_FINI_RETURN
 }

uspace/drv/ohci/ohci.h

@@ -49 +49 @@
 } ohci_t;
 
-int ohci_init(ohci_t *instance, ddf_dev_t *device);
+int device_setup_ohci(ddf_dev_t *device, ohci_t *instance);
 
 #endif