Changeset 3f03199 in mainline for uspace/drv/bus/usb/ehci/res.c

Timestamp:

2013-09-15T06:33:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (4 diffs)

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];
@@ -234 +231 @@
 }
 
-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);
         usb_log_debug("Disabling EHCI legacy support.\n");
 
-#define CHECK_RET_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                return ret; \
-        } else (void)0
-
         /* Map EHCI registers */
         void *regs = NULL;
-        int ret = pio_enable((void*)reg_base, reg_size, &regs);
-        CHECK_RET_RETURN(ret, "Failed to map registers %p: %s.\n",
-            (void *) reg_base, str_error(ret));
+        int ret = pio_enable_range(reg_range, &regs);
+        if (ret != EOK) {
+                usb_log_error("Failed to map registers %p: %s.\n",
+                    RNGABSPTR(*reg_range), str_error(ret));
+                return ret;
+        }
 
         usb_log_debug2("Registers mapped at: %p.\n", regs);
@@ -264 +258 @@
 
         ret = disable_extended_caps(device, eecp);
-        CHECK_RET_RETURN(ret, "Failed to disable extended capabilities: %s.\n",
-            str_error(ret));
-
-#undef CHECK_RET_RETURN
+        if (ret != EOK) {
+                usb_log_error("Failed to disable extended capabilities: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+
 
         /*