Changes in uspace/drv/bus/usb/uhci/uhci.c [795448f:b500d60a] in mainline

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (8 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -41 +41 @@
 
 #include "uhci.h"
-
-#include "res.h"
+#include "pci.h"
+
 #include "hc.h"
 #include "root_hub.h"
@@ -49 +49 @@
  * and USB root hub */
 typedef struct uhci {
-        /** Pointer to DDF representation of UHCI host controller */
+        /** Pointer to DDF represenation of UHCI host controller */
         ddf_fun_t *hc_fun;
-        /** Pointer to DDF representation of UHCI root hub */
+        /** Pointer to DDF represenation of UHCI root hub */
         ddf_fun_t *rh_fun;
 
-        /** Internal driver's representation of UHCI host controller */
+        /** Internal driver's represenation of UHCI host controller */
         hc_t hc;
-        /** Internal driver's representation of UHCI root hub */
+        /** Internal driver's represenation of UHCI root hub */
         rh_t rh;
 } uhci_t;
@@ -148 +148 @@
 int device_setup_uhci(ddf_dev_t *device)
 {
-        if (!device)
-                return EBADMEM;
-
-        uhci_t *instance = ddf_dev_data_alloc(device, sizeof(uhci_t));
+        assert(device);
+        uhci_t *instance = malloc(sizeof(uhci_t));
         if (instance == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
@@ -160 +158 @@
 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); \
         } \
+        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
@@ -187 +188 @@
         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 I/O addresses for %" PRIun ": %s.\n",
@@ -194 +195 @@
             (void *) reg_base, reg_size, irq);
 
-        ret = disable_legacy(device);
+        ret = pci_disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));
 
-        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];
-        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
+        const size_t cmd_count = hc_irq_cmd_count();
+        irq_cmd_t irq_cmds[cmd_count];
+        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));
 
-        irq_code_t irq_code = {
-                .rangecount = ranges_count,
-                .ranges = irq_ranges,
-                .cmdcount = cmds_count,
-                .cmds = irq_cmds
-        };
+        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
 
         /* Register handler to avoid interrupt lockup */
@@ -220 +214 @@
 
         bool interrupts = false;
-        ret = enable_interrupts(device);
+        ret = pci_enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
@@ -233 +227 @@
             "Failed to init uhci_hcd: %s.\n", str_error(ret));
 
+        device->driver_data = instance;
+
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \