Changeset 3f3afb9 in mainline for uspace/drv/ohci/ohci_regs.h

Timestamp:

2011-04-11T20:38:37Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1324ff3, a39cfb8

Parents:

58226b4 (diff), d91645ab (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:

forgotten hub port powering

File:

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

uspace/drv/ohci/ohci_regs.h

@@ -84 +84 @@
         /** Interupt enable/disable, reads give the same value, writing causes
          * enable/disable */
-        volatile uint32_t interupt_enable;
+        volatile uint32_t interrupt_enable;
         volatile uint32_t interrupt_disable;
 #define I_SO   (1 << 0)   /* Scheduling overrun */
@@ -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 */
@@ -120 +120 @@
         /** Frame time and max packet size for all transfers */
         volatile uint32_t fm_interval;
-#define FMI_FI_MASK (0x1fff) /* Frame interval in bit times (should be 11999)*/
+#define FMI_FI_MASK (0x3fff) /* Frame interval in bit times (should be 11999)*/
 #define FMI_FI_SHIFT (0)
 #define FMI_FSMPS_MASK (0x7fff) /* Full speed max packet size */
@@ -138 +138 @@
         /** Remaining bit time in frame to start periodic transfers */
         volatile uint32_t periodic_start;
-#define PS_PS_MASK (0x1fff) /* bit time when periodic get priority (0x3e67) */
+#define PS_PS_MASK (0x3fff) /* bit time when periodic get priority (0x3e67) */
 
         /** Threshold for starting LS transaction */