Changeset af60409 in mainline for uspace/drv/platform/amdm37x/cm

Timestamp:

2018-03-26T20:04:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

eb748a0

Parents:

b752a31

Message:

Modify PADDn macros so that their use is easier to parse.

Location:

uspace/drv/platform/amdm37x/cm

Files:

• clock_control.h (modified) (3 diffs)
• core.h (modified) (5 diffs)
• iva2.h (modified) (3 diffs)
• mpu.h (modified) (4 diffs)
• usbhost.h (modified) (1 diff)

uspace/drv/platform/amdm37x/cm/clock_control.h

@@ -74 +74 @@
 #define CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_LOCK   (0x7)
 
-        PADD32[6];
+        PADD32(6);
 
         const ioport32_t idlest_ckgen;
@@ -95 +95 @@
 #define CLOCK_CONTROL_CM_IDLEST2_CKGEN_ST_PERIPH2_CLK_FLAG   (1 << 0)
 
-        PADD32[2];
+        PADD32(2);
 
         ioport32_t autoidle_pll;
@@ -111 +111 @@
 #define CLOCK_CONTROL_CM_AUTOIDLE2_PLL_AUTO_PERIPH2_DPLL_AUTOMATIC   (0x1)
 
-        PADD32[2];
+        PADD32(2);
 
         ioport32_t clksel1_pll;

uspace/drv/platform/amdm37x/cm/core.h

@@ -63 +63 @@
 #define CORE_CM_FCLKEN1_EN_MMC3_FLAG  (1 << 30)
 
-        PADD32;
+        PADD32(1);
         ioport32_t fclken3;
 #define CORE_CM_FCLKEN3_EN_TS_FLAG  (1 << 1)
 #define CORE_CM_FCLKEN3_EN_USBTLL_FLAG  (1 << 2)
 
-        PADD32;
+        PADD32(1);
         ioport32_t iclken1;
 #define CORE_CM_ICLKEN1_EN_SDRC_FLAG  (1 << 1)
@@ -97 +97 @@
 #define CORE_CM_ICLKEN3_EN_USBTLL_FLAG  (1 << 2)
 
-        PADD32;
+        PADD32(1);
         const ioport32_t idlest1;
 #define CORE_CM_IDLEST1_ST_SDRC_FLAG  (1 << 1)
@@ -128 +128 @@
 #define CORE_CM_IDLEST3_ST_USBTLL_FLAG  (1 << 2)
 
-        PADD32;
+        PADD32(1);
         ioport32_t autoidle1;
 #define CORE_CM_AUTOIDLE1_AUTO_HSOTGUSB_FLAG  (1 << 4)
@@ -156 +156 @@
 #define CORE_CM_AUTOIDLE3_AUTO_USBTLL_FLAG  (1 << 2)
 
-        PADD32;
+        PADD32(1);
         ioport32_t clksel;
 #define CORE_CM_CLKSEL_CLKSEL_L3_MASK  (0x3 << 0)
@@ -170 +170 @@
 #define CORE_CM_CLKSEL_CLKSEL_GPT11_FLAG (1 << 7)
 
-        PADD32;
+        PADD32(1);
         ioport32_t clkstctrl;
 #define CORE_CM_CLKCTRL_CLKCTRL_L3_MASK  (0x3 << 0)

uspace/drv/platform/amdm37x/cm/iva2.h

@@ -55 +55 @@
 #define IVA2_CM_CLKEN_PLL_EN_IVA2_DPLL_EN_IVA2_DPLL_LOCKED   (0x7)
 
-        PADD32[6];
+        PADD32(6);
         const ioport32_t idlest;
 #define IVA2_CM_IDLEST_ST_IVA2_STANDBY_FLAG   (1 << 0)
@@ -62 +62 @@
 #define IVA2_CM_IDLEST_PLL_ST_IVA2_CLK_LOCKED_FLAG   (1 << 0)
 
-        PADD32[3];
+        PADD32(3);
         ioport32_t autoidle_pll;
 #define IVA2_CM_AUTOIDLE_PLL_AUTO_IVA2_DPLL_MASK   (0x7)
@@ -68 +68 @@
 #define IVA2_CM_AUTOIDLE_PLL_AUTO_IVA2_DPLL_ENABLED   (0x1)
 
-        PADD32[2];
+        PADD32(2);
         ioport32_t clksel1_pll;
 #define IVA2_CM_CLKSEL1_PLL_IVA2_CLK_SRC_MASK   (0x7 << 19)

uspace/drv/platform/amdm37x/cm/mpu.h

@@ -44 +44 @@
 
 typedef struct {
-        PADD32;
+        PADD32(1);
         ioport32_t clken_pll;
 #define MPU_CM_CLKEN_PLL_EN_MPU_DPLL_LP_MODE_FLAG   (1 << 10)
@@ -52 +52 @@
 #define MPU_CM_CLKEN_PLL_EN_MPU_DPLL_EN_MPU_DPLL_LOCKED   (0x7)
 
-        PADD32[6];
+        PADD32(6);
         const ioport32_t idlest;
 #define MPU_CM_IDLEST_ST_MPU_STANDBY_FLAG   (1 << 0)
@@ -59 +59 @@
 #define MPU_CM_IDLEST_PLL_ST_MPU_CLK_LOCKED_FLAG   (1 << 0)
 
-        PADD32[3];
+        PADD32(3);
         ioport32_t autoidle_pll;
 #define MPU_CM_AUTOIDLE_PLL_AUTO_MPU_DPLL_MASK   (0x7)
@@ -65 +65 @@
 #define MPU_CM_AUTOIDLE_PLL_AUTO_MPU_DPLL_ENABLED   (0x1)
 
-        PADD32[2];
+        PADD32(2);
         ioport32_t clksel1_pll;
 #define MPU_CM_CLKSEL1_PLL_MPU_CLK_SRC_MASK   (0x7 << 19)

uspace/drv/platform/amdm37x/cm/usbhost.h

@@ -48 +48 @@
 #define USBHOST_CM_FCLKEN_EN_USBHOST2_FLAG  (1 << 1)
 
-        PADD32[3];
+        PADD32(3);
         ioport32_t iclken;
 #define USBHOST_CM_ICLKEN_EN_USBHOST  (1 << 0)
 
-        PADD32[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)
 
-        PADD32[3];
+        PADD32(3);
         ioport32_t autoidle;
 #define USBHOST_CM_AUTOIDLE_AUTO_USBHOST_FLAG  (1 << 0)
 
-        PADD32[4];
+        PADD32(4);
         ioport32_t sleepdep;
 #define USBHOST_CM_SLEEPDEP_EN_MPU_FLAG  (1 << 1)