Changeset 2e8a01b in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2011-07-10T21:17:38Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1f6eb7d

Parents:

1ecc5de

Message:

OHCI: Use the new way of generating IRQ code

Use bogus read to force kernel to create mapping (perhaps a flag could be added and used by pio_enable, to avoid this)

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (2 diffs)

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

@@ -177 +177 @@
          * and accepts physical addresses in IRQ code.
          * TODO: remove */
-        void *registers;
-        const int ret = pio_enable((void*)regs, reg_size, &registers);
+        ohci_regs_t *registers;
+        const int ret = pio_enable((void*)regs, reg_size, (void**)&registers);
+
+        /* Some bogus access to force create mapping. DO NOT remove,
+         * unless whole virtual addresses in irq is replaced */
+        registers->revision;
 
         if (ret != EOK)
@@ -185 +189 @@
         memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
 
-        void *address = (void*)&(((ohci_regs_t*)registers)->interrupt_status);
+        void *address = (void*)&registers->interrupt_status;
         cmds[0].addr = address;
         cmds[3].addr = address;