Changeset 7de1988c in mainline for uspace/drv/bus/usb/uhcirh

Timestamp:

2013-09-12T20:53:09Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddd0499d

Parents:

8049b79

Message:

Adapt drivers using parsed HW resources to use the new interface.

Location:

uspace/drv/bus/usb/uhcirh

Files:

• main.c (modified) (6 diffs)
• root_hub.c (modified) (2 diffs)
• root_hub.h (modified) (2 diffs)

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

@@ -48 +48 @@
 #define NAME "uhcirh"
 
-static int hc_get_my_registers(ddf_dev_t *dev,
-    uintptr_t *io_reg_address, size_t *io_reg_size);
+static int hc_get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs);
 
 static int uhci_rh_dev_add(ddf_dev_t *device);
@@ -90 +89 @@
             ddf_dev_get_handle(device));
 
-        uintptr_t io_regs = 0;
-        size_t io_size = 0;
+        addr_range_t regs;
         uhci_root_hub_t *rh = NULL;
         int rc;
 
-        rc = hc_get_my_registers(device, &io_regs, &io_size);
+        rc = hc_get_my_registers(device, &regs);
         if (rc != EOK) {
                 usb_log_error( "Failed to get registers from HC: %s.\n",
@@ -103 +101 @@
 
         usb_log_debug("I/O regs at %p (size %zuB).\n",
-            (void *) io_regs, io_size);
+            RNGABSPTR(regs), RNGSZ(regs));
 
         rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
@@ -111 +109 @@
         }
 
-        rc = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
+        rc = uhci_root_hub_init(rh, &regs, device);
         if (rc != EOK) {
                 usb_log_error("Failed(%d) to initialize rh driver instance: "
@@ -127 +125 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] io_reg_address Base address of the memory range.
- * @param[out] io_reg_size Size of the memory range.
+ * @param[out] io_regs_p Pointer to the device's register range.
  * @return Error code.
  */
-int hc_get_my_registers(
-    ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
+int hc_get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p)
 {
         async_sess_t *parent_sess =
@@ -153 +149 @@
         }
 
-        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;
+        if (io_regs_p != NULL)
+                *io_regs_p = hw_res.io_ranges.ranges[0];
 
         hw_res_list_parsed_clean(&hw_res);

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

@@ -36 +36 @@
 #include <ddi.h>
 #include <usb/debug.h>
+#include <device/hw_res_parsed.h>
 
 #include "root_hub.h"
@@ -42 +43 @@
  *
  * @param[in] instance Driver memory structure to use.
- * @param[in] addr Address of I/O registers.
- * @param[in] size Size of available I/O space.
+ * @param[in] io_regs Range of I/O registers.
  * @param[in] rh Pointer to DDF instance of the root hub driver.
  * @return Error code.
  */
-int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
+int uhci_root_hub_init(uhci_root_hub_t *instance, addr_range_t *io_regs,
+    ddf_dev_t *rh)
 {
+        port_status_t *regs;
+
         assert(instance);
         assert(rh);
 
         /* Allow access to root hub port registers */
-        assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT <= size);
-        port_status_t *regs;
-        int ret = pio_enable(addr, size, (void**)&regs);
+        assert(sizeof(*regs) * UHCI_ROOT_HUB_PORT_COUNT <= io_regs->size);
+
+        int ret = pio_enable_range(io_regs, (void **) &regs);
         if (ret < 0) {
                 usb_log_error(
                     "Failed(%d) to gain access to port registers at %p: %s.\n",
-                    ret, regs, str_error(ret));
+                    ret, RNGABSPTR(*io_regs), str_error(ret));
                 return ret;
         }

uspace/drv/bus/usb/uhcirh/root_hub.h

@@ -36 +36 @@
 
 #include <ddf/driver.h>
+#include <device/hw_res_parsed.h>
 
 #include "port.h"
@@ -48 +49 @@
 } uhci_root_hub_t;
 
-int uhci_root_hub_init(
-    uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh);
+int uhci_root_hub_init(uhci_root_hub_t *instance, addr_range_t *regs,
+    ddf_dev_t *rh);
 
 void uhci_root_hub_fini(uhci_root_hub_t *instance);