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

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/ehci

Files:

• main.c (modified) (2 diffs)
• res.c (modified) (4 diffs)
• res.h (modified) (1 diff)

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

@@ -77 +77 @@
         assert(device);
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t reg_range;
         int irq = 0;
 
-        int rc = get_my_registers(device, &reg_base, &reg_size, &irq);
+        int rc = get_my_registers(device, &reg_range, &irq);
         if (rc != EOK) {
                 usb_log_error("Failed to get memory addresses for %" PRIun
@@ -88 +87 @@
         }
 
-        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
-            reg_base, reg_size, irq);
+        usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
 
-        rc = disable_legacy(device, reg_base, reg_size);
+        rc = disable_legacy(device, &reg_range);
         if (rc != EOK) {
                 usb_log_error("Failed to disable legacy USB: %s.\n",

uspace/drv/bus/usb/ehci/res.c

@@ -71 +71 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] mem_reg_address Base address of the memory range.
- * @param[out] mem_reg_size Size of the memory range.
+ * @param[out] mem_regs_p Pointer to the register range.
  * @param[out] irq_no IRQ assigned to the device.
  * @return Error code.
  */
 int get_my_registers(ddf_dev_t *dev,
-    uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
+    addr_range_t *mem_regs_p, int *irq_no)
 {
         assert(dev);
@@ -99 +98 @@
         }
 
-        if (mem_reg_address)
-                *mem_reg_address = hw_res.mem_ranges.ranges[0].address;
-        if (mem_reg_size)
-                *mem_reg_size = hw_res.mem_ranges.ranges[0].size;
+        if (mem_regs_p)
+                *mem_regs_p = hw_res.mem_ranges.ranges[0];
         if (irq_no)
                 *irq_no = hw_res.irqs.irqs[0];
@@ -267 +264 @@
 }
 
-int disable_legacy(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size)
+int disable_legacy(ddf_dev_t *device, addr_range_t *reg_range)
 {
         assert(device);
@@ -274 +271 @@
         /* Map EHCI registers */
         void *regs = NULL;
-        int rc = pio_enable((void*)reg_base, reg_size, &regs);
+        int rc = pio_enable_range(reg_range, &regs);
         if (rc != EOK) {
                 usb_log_error("Failed to map registers %p: %s.\n",
-                    (void *) reg_base, str_error(rc));
+                    RNGABSPTR(*reg_range), str_error(rc));
                 return rc;
         }

uspace/drv/bus/usb/ehci/res.h

@@ -37 +37 @@
 
 #include <ddf/driver.h>
+#include <device/hw_res_parsed.h>
 
-int get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
+int get_my_registers(ddf_dev_t *, addr_range_t *, int *);
 int enable_interrupts(ddf_dev_t *);
-int disable_legacy(ddf_dev_t *, uintptr_t, size_t);
+int disable_legacy(ddf_dev_t *, addr_range_t *);
 
 #endif