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

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

@@ -111 +111 @@
  * @param[out] cmds Commands buffer.
  * @param[in] cmds_size Size of the commands buffer (bytes).
- * @param[in] regs Physical address of device's registers.
- * @param[in] reg_size Size of the register area (bytes).
+ * @param[in] regs Device's register range.
  *
  * @return Error code.
@@ -118 +117 @@
 int
 hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
-    size_t cmds_size, uintptr_t regs, size_t reg_size)
+    size_t cmds_size, addr_range_t *regs)
 {
         if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
             (cmds_size < sizeof(uhci_irq_commands)) ||
-            (reg_size < sizeof(uhci_regs_t)))
+            (RNGSZ(*regs) < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
         memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
-        ranges[0].base = regs;
+        ranges[0].base = RNGABS(*regs);
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-        uhci_regs_t *registers = (uhci_regs_t *) regs;
+        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
         cmds[0].addr = (void*)&registers->usbsts;
         cmds[3].addr = (void*)&registers->usbsts;
+
+        return EOK;
+}
+
+/** Register interrupt handler.
+ *
+ * @param[in] device Host controller DDF device
+ * @param[in] regs Register range
+ * @param[in] irq Interrupt number
+ * @paran[in] handler Interrupt handler
+ *
+ * @return EOK on success or negative error code
+ */
+int hc_register_irq_handler(ddf_dev_t *device, addr_range_t *regs, int irq,
+    interrupt_handler_t handler)
+{
+        assert(device);
+        irq_pio_range_t irq_ranges[hc_irq_pio_range_count()];
+        irq_cmd_t irq_cmds[hc_irq_cmd_count()];
+
+        int ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
+            sizeof(irq_cmds), regs);
+        if (ret != EOK) {
+                usb_log_error("Failed to generate IRQ commands: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+
+        irq_code_t irq_code = {
+                .rangecount = hc_irq_pio_range_count(),
+                .ranges = irq_ranges,
+                .cmdcount = hc_irq_cmd_count(),
+                .cmds = irq_cmds
+        };
+
+        /* Register handler to avoid interrupt lockup */
+        ret = register_interrupt_handler(device, irq, handler, &irq_code);
+        if (ret != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
 
         return EOK;
@@ -196 +237 @@
  *
  * @param[in] instance Memory place to initialize.
- * @param[in] regs Address of I/O control registers.
- * @param[in] reg_size Size of I/O control registers.
+ * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
  * @return Error code.
@@ -205 +245 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interrupts)
-{
-        assert(reg_size >= sizeof(uhci_regs_t));
+int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
+{
+        assert(instance);
+        assert(regs);
+        assert(regs->size >= sizeof(uhci_regs_t));
 
         instance->hw_interrupts = interrupts;
@@ -214 +256 @@
         /* allow access to hc control registers */
         uhci_regs_t *io;
-        int ret = pio_enable(regs, reg_size, (void **)&io);
+        int ret = pio_enable_range(regs, (void **) &io);
         if (ret != EOK) {
                 usb_log_error("Failed to gain access to registers at %p: %s.\n",
@@ -223 +265 @@
 
         usb_log_debug(
-            "Device registers at %p (%zuB) accessible.\n", io, reg_size);
+            "Device registers at %p (%zuB) accessible.\n", io, regs->size);
 
         ret = hc_init_mem_structures(instance);