Changeset 52fc805 in mainline for uspace/drv/infrastructure/rootamdm37x/uhh.h

Timestamp:

2012-10-15T19:27:58Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a5a73c0

Parents:

f4c9e42

Message:

rootamdm37x: Use new pio functions to access UHH and TLL

File:

• uspace/drv/infrastructure/rootamdm37x/uhh.h (modified) (3 diffs)

uspace/drv/infrastructure/rootamdm37x/uhh.h

@@ -42 +42 @@
 typedef struct {
         const ioport32_t revision;
-#define UHH_REVISION_MASK  0xf
-#define UHH_REVISION_MINOR_SHIFT  0
-#define UHH_REVISION_MAJOR_SHIFT  4
+#define UHH_REVISION_MINOR_MASK  0x0f
+#define UHH_REVISION_MAJOR_MASK  0xf0
 
         uint32_t padd0_[3];
@@ -51 +50 @@
 #define UHH_SYSCONFIG_SOFTRESET_FLAG  (1 << 1)
 #define UHH_SYSCONFIG_ENWAKEUP_FLAG  (1 << 2)
+#define UHH_SYSCONFIG_SIDLE_MODE_MASK  (0x3 << 3)
+#define UHH_SYSCONFIG_SIDLE_MODE_FORCE  (0x0 << 3)
+#define UHH_SYSCONFIG_SIDLE_MODE_NO  (0x1 << 3)
+#define UHH_SYSCONFIG_SIDLE_MODE_SMART  (0x2 << 3)
 #define UHH_SYSCONFIG_CLOCKACTIVITY_FLAG  (1 << 8)
-#define UHH_SYSCONFIG_SIDLE_MODE_MASK  0x3
-#define UHH_SYSCONFIG_SIDLE_MODE_SHIFT  3
-#define UHH_SYSCONFIG_MIDLE_MODE_MASK  0x3
-#define UHH_SYSCONFIG_MIDLE_MODE_SHIFT  12
+#define UHH_SYSCONFIG_MIDLE_MODE_MASK  (0x3 << 12)
+#define UHH_SYSCONFIG_MIDLE_MODE_FORCE  (0x0 << 12)
+#define UHH_SYSCONFIG_MIDLE_MODE_NO  (0x1 << 12)
+#define UHH_SYSCONFIG_MIDLE_MODE_SMART  (0x2 << 12)
 
         const ioport32_t sysstatus;
@@ -77 +80 @@
 
         ioport32_t debug_csr;
-#define UHH_DEBUG_CSR_EHCI_FLADJ_MASK  (0x3f)
-#define UHH_DEBUG_CSR_EHCI_FLADJ_SHIFT  0
+#define UHH_DEBUG_CSR_EHCI_FLADJ_MASK  (0x3f << 0)
+#define UHH_DEBUG_CSR_EHCI_FLADJ(x)  ((x) & 0x3f)
 #define UHH_DEBUG_CSR_EHCI_SIMULATION_MODE_FLAG  (1 << 6)
 #define UHH_DEBUG_CSR_OHCI_CNTSEL_FLAG  (1 << 7)