Changeset ba4a03a5 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2013-12-31T23:11:00Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d1df381

Parents:

e3a07bba

Message:

usb host: Use all hw resources when generating irq code.

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci.c (modified) (5 diffs)
• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)

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

@@ -96 +96 @@
         addr_range_t regs = hw_res.mem_ranges.ranges[0];
         const int irq = hw_res.irqs.irqs[0];
-        hw_res_list_parsed_clean(&hw_res);
-
-        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(regs), RNGSZ(regs), irq);
 
         /* Initialize generic HCD driver */
@@ -107 +103 @@
                 usb_log_error("Failed to setup generic hcd structures: %s.",
                     str_error(ret));
+                hw_res_list_parsed_clean(&hw_res);
                 return ret;
         }
@@ -113 +110 @@
         if (!hc) {
                 usb_log_error("Failed to allocate driver structure.\n");
+                hw_res_list_parsed_clean(&hw_res);
                 ret = ENOMEM;
                 goto ddf_hc_clean;
@@ -119 +117 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = hcd_ddf_setup_interrupts(device, &regs, irq, irq_handler,
+        ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
             hc_gen_irq_code);
         if (ret != EOK) {
@@ -131 +129 @@
         /* Initialize EHCI HC */
         ret = hc_init(hc, &regs, interrupts);
+        hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
                 usb_log_error("Failed to init hc: %s.\n", str_error(ret));

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

@@ -99 +99 @@
  * @param[out] cmds Commands buffer.
  * @param[in] cmds_size Size of the commands buffer (bytes).
- * @param[in] regs Device's register range.
+ * @param[in] hw_res Device's resources.
  *
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs)
+int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
-        if (RNGSZ(*regs) < sizeof(ehci_regs_t))
+        assert(hw_res);
+
+        if (hw_res->irqs.count != 1 || hw_res->mem_ranges.count != 1)
+                return EINVAL;
+
+        addr_range_t regs = hw_res->mem_ranges.ranges[0];
+
+        if (RNGSZ(regs) < sizeof(ehci_regs_t))
                 return EOVERFLOW;
 
@@ -123 +130 @@
 
         memcpy(code->ranges, ehci_pio_ranges, sizeof(ehci_pio_ranges));
-        code->ranges[0].base = RNGABS(*regs);
+        code->ranges[0].base = RNGABS(regs);
 
         memcpy(code->cmds, ehci_irq_commands, sizeof(ehci_irq_commands));
         ehci_caps_regs_t *caps = NULL;
-        int ret = pio_enable_range(regs, (void**)&caps);
+        int ret = pio_enable_range(&regs, (void**)&caps);
         if (ret != EOK) {
                 return ret;
         }
         ehci_regs_t *registers =
-            (ehci_regs_t *)(RNGABSPTR(*regs) + EHCI_RD8(caps->caplength));
+            (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(caps->caplength));
         code->cmds[0].addr = (void *) &registers->usbsts;
         code->cmds[3].addr = (void *) &registers->usbsts;
         EHCI_WR(code->cmds[1].value, EHCI_USED_INTERRUPTS);
 
-        return EOK;
+        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
+
+        return hw_res->irqs.irqs[0];
 }
 

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

@@ -74 +74 @@
 } hc_t;
 
-int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs);
+int hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts);