Changeset 3f03199 in mainline for uspace/drv/bus/usb/ehci/main.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/main.c (modified) (2 diffs)

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
 }