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

Timestamp:

2013-09-15T06:33:53Z (12 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/uhci/uhci.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -80 +80 @@
                 return EBADMEM;
 
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
-
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t regs;
         int irq = 0;
 
-        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
-        CHECK_RET_RETURN(ret, "Failed to get I/O region for %" PRIun ": %s.\n",
-            ddf_dev_get_handle(device), str_error(ret));
-        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
+        int ret = get_my_registers(device, &regs, &irq);
+        if (ret != EOK) {
+                usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n",
+                    ddf_dev_get_handle(device), str_error(ret));
+                return ret;
+        }
+        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
-        const size_t ranges_count = hc_irq_pio_range_count();
-        const size_t cmds_count = hc_irq_cmd_count();
-        irq_pio_range_t irq_ranges[ranges_count];
-        irq_cmd_t irq_cmds[cmds_count];
-        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        CHECK_RET_RETURN(ret, "Failed to generate IRQ commands: %s.\n",
-            str_error(ret));
+        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+        if (ret != EOK) {
+                usb_log_error("Failed to setup generic HCD.\n");
+                return ret;
+        }
 
-        irq_code_t irq_code = {
-                .rangecount = ranges_count,
-                .ranges = irq_ranges,
-                .cmdcount = cmds_count,
-                .cmds = irq_cmds
-        };
+        hc_t *hc = malloc(sizeof(hc_t));
+        if (!hc) {
+                usb_log_error("Failed to allocate UHCI HC structure.\n");
+                hcd_ddf_clean_hc(device);
+                return ENOMEM;
+        }
 
-        /* Register handler to avoid interrupt lockup */
-        ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);
-        CHECK_RET_RETURN(ret, "Failed to register interrupt handler: %s.\n",
-            str_error(ret));
-        
-        ret = disable_legacy(device);
-        CHECK_RET_RETURN(ret, "Failed to disable legacy USB: %s.\n",
-            str_error(ret));
+        ret = hc_register_irq_handler(device, &regs, irq, irq_handler);
+        if (ret != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(ret));
+                hcd_ddf_clean_hc(device);
+                return ret;
+        }
 
         bool interrupts = false;
@@ -131 +124 @@
         }
 
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");
-        
-        hc_t *hc = malloc(sizeof(hc_t));
-        ret = hc ? EOK : ENOMEM;
-        CHECK_RET_RETURN(ret, "Failed to allocate UHCI HC structure.\n");
+        ret = disable_legacy(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to disable legacy USB: %s.\n",
+                    str_error(ret));
+                hcd_ddf_clean_hc(device);
+                return ret;
+        }
 
-        ret = hc_init(hc, (void*)reg_base, reg_size, interrupts);
-        CHECK_RET_RETURN(ret,
-            "Failed to init uhci_hcd: %s.\n", str_error(ret));
+        ret = hc_init(hc, &regs, interrupts);
+        if (ret != EOK) {
+                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
+                hcd_ddf_clean_hc(device);
+                // TODO unregister interrupt handler
+                return ret;
+        }
 
         hcd_set_implementation(dev_to_hcd(device), hc, hc_schedule, NULL, NULL);
@@ -151 +148 @@
         ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
-                // TODO: Undo hcd_setup_device
                 hc_fini(hc);
-                CHECK_RET_RETURN(ret, "Failed to setup UHCI root hub: %s.\n",
+                hcd_ddf_clean_hc(device);
+                // TODO unregister interrupt handler
+                usb_log_error("Failed to setup UHCI root hub: %s.\n",
                     str_error(ret));
                 return ret;