Changes in uspace/drv/bus/usb/ohci/ohci.c [44c1a48:27ed734c] in mainline

File:

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

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "res.h"
+#include "pci.h"
 #include "hc.h"
 
@@ -140 +140 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
-        if (device == NULL)
-                return EBADMEM;
-
-        ohci_t *instance = ddf_dev_data_alloc(device,sizeof(ohci_t));
+        assert(device);
+
+        ohci_t *instance = malloc(sizeof(ohci_t));
         if (instance == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
                 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->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         } \
         if (instance->rh_fun) { \
-                instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
+        free(instance); \
         usb_log_error(message); \
         return ret; \
@@ -180 +180 @@
         int irq = 0;
 
-        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get register memory addresses for %" PRIun ": %s.\n",
@@ -187 +187 @@
             (void *) reg_base, reg_size, irq);
 
-        const size_t ranges_count = hc_irq_pio_range_count();
-        const size_t cmds_count = hc_irq_cmd_count();
-        irq_pio_range_t irq_ranges[ranges_count];
-        irq_cmd_t irq_cmds[cmds_count];
-        irq_code_t irq_code = {
-                .rangecount = ranges_count,
-                .ranges = irq_ranges,
-                .cmdcount = cmds_count,
-                .cmds = irq_cmds
-        };
-
-        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to generate IRQ code: %s.\n", str_error(ret));
+        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);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to generate IRQ commands: %s.\n", str_error(ret));
 
 
@@ -211 +204 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = enable_interrupts(device);
+        ret = pci_enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
@@ -226 +219 @@
             "Failed to init ohci_hcd: %s.\n", str_error(ret));
 
+        device->driver_data = instance;
+
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \