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

Timestamp:

2011-04-15T13:19:59Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

da1dd48

Parents:

e3b5129 (diff), 8fd4ba0 (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:

Development changes

File:

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

uspace/drv/ohci/ohci_regs.h

@@ -55 +55 @@
 #define C_HCFS_MASK        (0x3) /* Host controller functional state */
 #define C_HCFS_RESET       (0x0)
-#define C_HCFS_OPERATIONAL (0x1)
-#define C_HCFS_RESUME      (0x2)
+#define C_HCFS_RESUME      (0x1)
+#define C_HCFS_OPERATIONAL (0x2)
 #define C_HCFS_SUSPEND     (0x3)
 #define C_HCFS_SHIFT       (6)
@@ -100 +100 @@
 #define HCCA_PTR_MASK 0xffffff00 /* HCCA is 256B aligned */
 
-        /** Currently executed period endpoint */
-        const volatile uint32_t period_current;
+        /** Currently executed periodic endpoint */
+        const volatile uint32_t periodic_current;
 
         /** The first control endpoint */