Changeset f8e8738 in mainline for uspace/drv/ohci/ohci_regs.h

Timestamp:

2011-04-07T20:22:40Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fee6381

Parents:

61257f4 (diff), a82889e (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:

Changes from development

File:

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

uspace/drv/ohci/ohci_regs.h

@@ -39 +39 @@
 typedef struct ohci_regs
 {
-        volatile uint32_t revision;
+        const volatile uint32_t revision;
         volatile uint32_t control;
+#define C_CSBR_MASK (0x3)
+#define C_CSBR_SHIFT (0)
+#define C_PLE (1 << 2)
+#define C_IE (1 << 3)
+#define C_CLE (1 << 4)
+#define C_BLE (1 << 5)
+
+#define C_HCFS_MASK (0x3)
+#define C_HCFS_SHIFT (6)
+#define C_HCFS_RESET (0x0)
+#define C_HCFS_OPERATIONAL (0x1)
+#define C_HCFS_RESUME (0x2)
+#define C_HCFS_SUSPEND (0x3)
+
+#define C_IR (1 << 8)
+#define C_RWC (1 << 9)
+#define C_RWE (1 << 10)
+
         volatile uint32_t command_status;
+#define CS_HCR (1 << 0)
+#define CS_CLF (1 << 1)
+#define CS_BLF (1 << 2)
+#define CS_OCR (1 << 3)
+#define CS_SOC_MASK (0x3)
+#define CS_SOC_SHIFT (16)
+
         volatile uint32_t interrupt_status;
 #define IS_SO (1 << 0)
@@ -51 +76 @@
 #define IS_RHSC (1 << 6)
 #define IS_OC (1 << 30)
+
         volatile uint32_t interupt_enable;
 #define IE_SO   (1 << 0)