Changeset f1d6866 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (11 diffs)

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "iface.h"
 #include "pci.h"
 #include "hc.h"
-#include "root_hub.h"
 
 typedef struct ohci {
@@ -52 +50 @@
 
         hc_t hc;
-        rh_t rh;
 } ohci_t;
 
@@ -89 +86 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.manager;
-
-        usb_address_t addr = usb_device_keeper_find(manager, handle);
+        usb_device_manager_t *manager =
+            &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
+
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
         if (addr < 0) {
                 return addr;
@@ -129 +127 @@
 /** Standard USB HC options (HC interface) */
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
 /*----------------------------------------------------------------------------*/
@@ -150 +148 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
+        assert(device);
+
         ohci_t *instance = malloc(sizeof(ohci_t));
         if (instance == NULL) {
@@ -155 +155 @@
                 return ENOMEM;
         }
+        instance->rh_fun = NULL;
+        instance->hc_fun = NULL;
 
 #define CHECK_RET_DEST_FREE_RETURN(ret, message...) \
 if (ret != EOK) { \
         if (instance->hc_fun) { \
-                instance->hc_fun->ops = NULL; \
-                instance->hc_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         } \
         if (instance->rh_fun) { \
-                instance->rh_fun->ops = NULL; \
-                instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
         free(instance); \
-        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
 } else (void)0
 
-        instance->rh_fun = NULL;
         instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci_hc");
         int ret = instance->hc_fun ? EOK : ENOMEM;
@@ -194 +190 @@
         ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to get memory addresses for %" PRIun ": %s.\n",
+            "Failed to get register memory addresses for %" PRIun ": %s.\n",
             device->handle, str_error(ret));
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
@@ -201 +197 @@
         const size_t cmd_count = hc_irq_cmd_count();
         irq_cmd_t irq_cmds[cmd_count];
+        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
+
         ret =
             hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size);
@@ -206 +204 @@
             "Failed to generate IRQ commands: %s.\n", str_error(ret));
 
-        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
 
         /* Register handler to avoid interrupt lockup */
@@ -234 +231 @@
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \
+        hc_fini(&instance->hc); \
         unregister_interrupt_handler(device, irq); \
-        hc_fini(&instance->hc); \
         CHECK_RET_DEST_FREE_RETURN(ret, message); \
 } else (void)0
@@ -248 +245 @@
             "Failed to add OHCI to HC class: %s.\n", str_error(ret));
 
-        hc_register_hub(&instance->hc, instance->rh_fun);
-        return EOK;
-
-#undef CHECK_RET_DEST_FUN_RETURN
+        ret = hc_register_hub(&instance->hc, instance->rh_fun);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to register OHCI root hub: %s.\n", str_error(ret));
+        return ret;
+
 #undef CHECK_RET_FINI_RETURN
 }