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

Timestamp:

2012-02-12T18:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bd8c6537

Parents:

a996ae31

Message:

UHCI and OHCI HC's now define and use proper IRQ PIO range.

Location:

uspace/drv/bus/usb/uhci

Files:

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

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

@@ -48 +48 @@
     (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)
 
-
-static const irq_cmd_t uhci_irq_commands[] =
-{
+static const irq_pio_range_t uhci_irq_pio_ranges[] = {
+        {
+                .base = 0,      /* filled later */
+                .size = sizeof(uhci_regs_t)
+        }
+};
+
+static const irq_cmd_t uhci_irq_commands[] = {
         { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
@@ -68 +73 @@
 
 /*----------------------------------------------------------------------------*/
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t);
+}
+/*----------------------------------------------------------------------------*/
 /** Get number of commands used in IRQ code.
  * @return Number of commands.
@@ -76 +89 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Generate IRQ code commands.
- * @param[out] cmds Place to store the commands.
- * @param[in] cmd_size Size of the place (bytes).
+/** Generate IRQ code.
+ * @param[out] ranges PIO ranges buffer.
+ * @param[in] ranges_size Size of the ranges buffer (bytes).
+ * @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).
@@ -84 +99 @@
  * @return Error code.
  */
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
-{
-        if (cmd_size < sizeof(uhci_irq_commands)
-            || reg_size < sizeof(uhci_regs_t))
+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)
+{
+        if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
+            (cmds_size < sizeof(uhci_irq_commands)) ||
+            (reg_size < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
-        uhci_regs_t *registers = (uhci_regs_t*)regs;
+        memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
+        ranges[0].base = regs;
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-
-        cmds[0].addr = (void*)&registers->usbsts;
-        cmds[3].addr = (void*)&registers->usbsts;
+        uhci_regs_t *registers = (uhci_regs_t *) regs;
+        cmds[0].addr = &registers->usbsts;
+        cmds[3].addr = &registers->usbsts;
+
         return EOK;
 }

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

@@ -121 +121 @@
 } hc_t;
 
+size_t hc_irq_pio_range_count(void);
 size_t hc_irq_cmd_count(void);
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size);
+int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t, uintptr_t,
+    size_t);
 void hc_interrupt(hc_t *instance, uint16_t status);
 int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts);

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

@@ -198 +198 @@
             "Failed to disable legacy USB: %s.\n", str_error(ret));
 
-        const size_t cmd_count = hc_irq_cmd_count();
-        irq_cmd_t irq_cmds[cmd_count];
-        ret =
-            hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size);
+        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_DEST_FREE_RETURN(ret,
             "Failed to generate IRQ commands: %s.\n", str_error(ret));
 
-        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
+        irq_code_t irq_code = {
+                .rangecount = ranges_count,
+                .ranges = irq_ranges,
+                .cmdcount = cmds_count,
+                .cmds = irq_cmds
+        };
 
         /* Register handler to avoid interrupt lockup */