Changeset c2b2de7 in mainline for uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h

Timestamp:

2012-10-17T22:17:29Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

150a2718

Parents:

6454ad47 (diff), 57912af3 (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:

merge changes from bbxm branch

File:

• uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/usbhost_cm.h ) (3 diffs)

uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h

@@ -35 +35 @@
 #ifndef AMDM37x_USBHOST_CM_H
 #define AMDM37x_USBHOST_CM_H
+#include <macros.h>
 #include <sys/types.h>
 
@@ -46 +47 @@
 #define USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG  (1 << 1)
 
-        uint32_t padd0_[3];
+        PADD32[3];
         ioport32_t iclken;
 #define USBHOST_CM_ICLKEN_EN_USBHOST  (1 << 0)
 
-        uint32_t padd1_[3];
+        PADD32[3];
         const ioport32_t idlest;
 #define USBHOST_CM_IDLEST_ST_USBHOST_STDBY_FLAG  (1 << 0)
 #define USBHOST_CM_IDLEST_ST_USBHOST_IDLE_FLAG  (1 << 1)
 
-        uint32_t padd2_[3];
+        PADD32[3];
         ioport32_t autoidle;
 #define USBHOST_CM_AUTOIDLE_AUTO_USBHOST_FLAG  (1 << 0)
 
-        uint32_t padd3_[4];
+        PADD32[4];
         ioport32_t sleepdep;
 #define USBHOST_CM_SLEEPDEP_EN_MPU_FLAG  (1 << 1)
@@ -65 +66 @@
 
         ioport32_t clkstctrl;
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_MASK  0x3
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_SHIFT  0
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_AUTO_DIS  0x0
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_SUPERVISED_SLEEP  0x1
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_SUPERVISED_WAKEUP  0x2
-#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_AUTO_EN  0x1
+#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_MASK  (0x3 << 0)
+#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_AUTO_DIS  (0x0 << 0)
+#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_SUPERVISED_SLEEP  (0x1 << 0)
+#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_SUPERVISED_WAKEUP  (0x2 << 0)
+#define USBHOST_CM_CLKSTCTRL_CLKSTCTRL_USBHOST_AUTO_EN  (0x3 << 0)
 
         ioport32_t clkstst;