Changes in uspace/drv/bus/usb/ohci/ohci.c [d57122c:8b54fe6] in mainline

File:

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

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

@@ -76 +76 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Get USB address assigned to root hub.
- *
- * @param[in] fun Root hub function.
- * @param[out] address Store the address here.
- * @return Error code.
- */
-static int rh_get_my_address(ddf_fun_t *fun, usb_address_t *address)
+/** Get address of the device identified by handle.
+ *
+ * @param[in] dev DDF instance of the device to use.
+ * @param[in] iid (Unused).
+ * @param[in] call Pointer to the call that represents interrupt.
+ */
+static int usb_iface_get_address(
+    ddf_fun_t *fun, devman_handle_t handle, usb_address_t *address)
 {
         assert(fun);
+        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;
+        }
 
         if (address != NULL) {
-                *address = dev_to_ohci(fun->dev)->hc.rh.address;
+                *address = addr;
         }
 
@@ -99 +107 @@
  * @return Error code.
  */
-static int rh_get_hc_handle(
+static int usb_iface_get_hc_handle(
     ddf_fun_t *fun, devman_handle_t *handle)
 {
@@ -113 +121 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_hc_handle = rh_get_hc_handle,
-        .get_my_address = rh_get_my_address,
+        .get_hc_handle = usb_iface_get_hc_handle,
+        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/
@@ -140 +148 @@
 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; \
@@ -187 +195 @@
             (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));
 
 
@@ -226 +227 @@
             "Failed to init ohci_hcd: %s.\n", str_error(ret));
 
+        device->driver_data = instance;
+
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \