Changes in uspace/drv/bus/usb/uhcirh/main.c [7de1988c:920d0fc] in mainline

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (4 diffs)

uspace/drv/bus/usb/uhcirh/main.c

@@ -48 +48 @@
 #define NAME "uhcirh"
 
-static int hc_get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs);
+static int hc_get_my_registers(ddf_dev_t *dev,
+    uintptr_t *io_reg_address, size_t *io_reg_size);
 
 static int uhci_rh_dev_add(ddf_dev_t *device);
@@ -89 +90 @@
             ddf_dev_get_handle(device));
 
-        addr_range_t regs;
+        uintptr_t io_regs = 0;
+        size_t io_size = 0;
         uhci_root_hub_t *rh = NULL;
-        int rc;
+        int ret = EOK;
 
-        rc = hc_get_my_registers(device, &regs);
-        if (rc != EOK) {
-                usb_log_error( "Failed to get registers from HC: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
+#define CHECK_RET_FREE_RH_RETURN(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        return ret; \
+} else (void)0
 
+        ret = hc_get_my_registers(device, &io_regs, &io_size);
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed to get registers from HC: %s.\n", str_error(ret));
         usb_log_debug("I/O regs at %p (size %zuB).\n",
-            RNGABSPTR(regs), RNGSZ(regs));
+            (void *) io_regs, io_size);
 
         rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
-        if (rh == NULL) {
-                usb_log_error("Failed to allocate rh driver instance.\n");
-                return ENOMEM;
-        }
+        ret = (rh == NULL) ? ENOMEM : EOK;
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed to allocate rh driver instance.\n");
 
-        rc = uhci_root_hub_init(rh, &regs, device);
-        if (rc != EOK) {
-                usb_log_error("Failed(%d) to initialize rh driver instance: "
-                    "%s.\n", rc, str_error(rc));
-                return rc;
-        }
+        ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed(%d) to initialize rh driver instance: %s.\n",
+            ret, str_error(ret));
 
         usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
             ddf_dev_get_name(device), ddf_dev_get_handle(device));
-
         return EOK;
 }
@@ -125 +125 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] io_regs_p Pointer to the device's register range.
+ * @param[out] io_reg_address Base address of the memory range.
+ * @param[out] io_reg_size Size of the memory range.
  * @return Error code.
  */
-int hc_get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p)
+int hc_get_my_registers(
+    ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
 {
         async_sess_t *parent_sess =
@@ -149 +151 @@
         }
 
-        if (io_regs_p != NULL)
-                *io_regs_p = hw_res.io_ranges.ranges[0];
+        if (io_reg_address != NULL)
+                *io_reg_address = hw_res.io_ranges.ranges[0].address;
+
+        if (io_reg_size != NULL)
+                *io_reg_size = hw_res.io_ranges.ranges[0].size;
 
         hw_res_list_parsed_clean(&hw_res);