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

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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.

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

@@ -67 +67 @@
 {
         assert(device);
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-}
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t reg_range;
         int irq = 0;
 
-        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
-        CHECK_RET_RETURN(ret,
-            "Failed to get memory addresses for %" PRIun ": %s.\n",
-            ddf_dev_get_handle(device), str_error(ret));
-        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
-            reg_base, reg_size, irq);
+        int ret = get_my_registers(device, &reg_range, &irq);
+        if (ret != EOK) {
+                usb_log_error("Failed to get memory addresses for %" PRIun
+                    ": %s.\n", ddf_dev_get_handle(device), str_error(ret));
+                return ret;
+        }
 
-        ret = disable_legacy(device, reg_base, reg_size);
-        CHECK_RET_RETURN(ret,
-            "Failed to disable legacy USB: %s.\n", str_error(ret));
+        usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
+
+        ret = disable_legacy(device, &reg_range);
+        if (ret != EOK) {
+                usb_log_error("Failed to disable legacy USB: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
 
         /* High Speed, no bandwidth */
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_HIGH, 0, NULL);        
-        CHECK_RET_RETURN(ret,
-            "Failed to init generci hcd driver: %s\n", str_error(ret));
+        ret = hcd_ddf_setup_hc(device, USB_SPEED_HIGH, 0, NULL);
+        if (ret != EOK) {
+                usb_log_error("Failed to init generci hcd driver: %s\n",
+                    str_error(ret));
+                return ret;
+        }
 
         usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
@@ -97 +100 @@
 
         return EOK;
-#undef CHECK_RET_RETURN
 }
 

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;
+        }
+
 
         /*

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