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

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/uhci

Files:

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

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

@@ -102 +102 @@
 /** Generate IRQ code.
  * @param[out] code IRQ code structure.
- * @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(uhci_regs_t))
+        assert(hw_res);
+
+        if (hw_res->irqs.count != 1 || hw_res->io_ranges.count != 1)
+                return EINVAL;
+        const addr_range_t regs = hw_res->io_ranges.ranges[0];
+
+        if (RNGSZ(regs) < sizeof(uhci_regs_t))
                 return EOVERFLOW;
 
@@ -127 +132 @@
 
         memcpy(code->ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
-        code->ranges[0].base = RNGABS(*regs);
+        code->ranges[0].base = RNGABS(regs);
 
         memcpy(code->cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
+        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(regs);
         code->cmds[0].addr = (void*)&registers->usbsts;
         code->cmds[3].addr = (void*)&registers->usbsts;
 
-        return EOK;
+        usb_log_debug("I/O 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/uhci/hc.h

@@ -127 +127 @@
 } 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);
 void hc_interrupt(hc_t *instance, uint16_t status);
 int hc_init(hc_t *instance, addr_range_t *regs, bool interupts);

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

@@ -98 +98 @@
         addr_range_t regs = hw_res.io_ranges.ranges[0];
         const int irq = hw_res.irqs.irqs[0];
-        hw_res_list_parsed_clean(&hw_res);
-
-        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(regs), RNGSZ(regs), irq);
 
         ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
@@ -107 +103 @@
         if (ret != EOK) {
                 usb_log_error("Failed to setup generic HCD.\n");
+                hw_res_list_parsed_clean(&hw_res);
                 return ret;
         }
@@ -113 +110 @@
         if (!hc) {
                 usb_log_error("Failed to allocate UHCI HC structure.\n");
+                hw_res_list_parsed_clean(&hw_res);
                 ret = ENOMEM;
                 goto ddf_hc_clean;
@@ -118 +116 @@
 
         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) {
@@ -129 +127 @@
 
         ret = hc_init(hc, &regs, interrupts);
+        hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));