Changeset 78ab6d4 in mainline for uspace/drv/bus/usb/ohci/ohci_regs.h

Timestamp:

2011-07-10T22:45:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4d62aa0

Parents:

1f6eb7d

Message:

OHCI: Device access fixes.

Only access Legacy support registers if their presence is indicated.
Fix setting host controller functional state, it's 2 bit value and standard
& and | operators are not enough.
Some comment fixes.

Tested on vbox.

File:

• uspace/drv/bus/usb/ohci/ohci_regs.h (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci_regs.h

@@ -36 +36 @@
 #include <stdint.h>
 
+#define LEGACY_REGS_OFFSET 0x100
+
 /** OHCI memory mapped registers structure */
 typedef struct ohci_regs {
         const volatile uint32_t revision;
+#define R_REVISION_MASK (0x3f)
+#define R_REVISION_SHIFT (0)
+#define R_LEGACY_FLAG   (0x80)
+
         volatile uint32_t control;
 #define C_CSBR_MASK (0x3) /* Control-bulk service ratio */
@@ -58 +64 @@
 #define C_HCFS_SUSPEND     (0x3)
 #define C_HCFS_SHIFT       (6)
+
+#define C_HCFS_GET(reg) \
+        ((reg >> C_HCFS_SHIFT) & C_HCFS_MASK)
+#define C_HCFS_SET(reg, hcfs_state) \
+do { \
+        reg = (reg & ~(C_HCFS_MASK << C_HCFS_SHIFT)) \
+            | ((hcfs_state & C_HCFS_MASK) << C_HCFS_SHIFT); \
+} while (0)
+
 
 #define C_IR  (1 << 8)   /* Interrupt routing, make sure it's 0 */