Changeset a5a73c0 in mainline

Timestamp:

2012-10-15T19:50:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

71d09d6e

Parents:

52fc805

Message:

rootamdm37x: Use PADD macro.

remove count parameter.

Location:

uspace

Files:

• drv/infrastructure/rootamdm37x/clock_control_cm.h (modified) (3 diffs)
• drv/infrastructure/rootamdm37x/core_cm.h (modified) (6 diffs)
• drv/infrastructure/rootamdm37x/uhh.h (modified) (3 diffs)
• drv/infrastructure/rootamdm37x/usbhost_cm.h (modified) (2 diffs)
• drv/infrastructure/rootamdm37x/usbtll.h (modified) (4 diffs)
• lib/c/include/macros.h (modified) (1 diff)

uspace/drv/infrastructure/rootamdm37x/clock_control_cm.h

@@ -73 +73 @@
 #define CLOCK_CONTROL_CM_CLKEN_PLL_EN_PERIPH2_DPLL_LOCK   (0x7)
 
-        PADD32(2);
+        PADD32[2];
 
         const ioport32_t idlest_ckgen;
@@ -94 +94 @@
 #define CLOCK_CONTROL_CM_IDLEST2_CKGEN_ST_PERIPH2_CLK_FLAG   (1 << 0)
 
-        PADD32(2);
+        PADD32[2];
 
         ioport32_t autoidle_pll;
@@ -109 +109 @@
 #define CLOCK_CONTROL_CM_AUTOIDLE2_PLL_AUTO_PERIPH2_DPLL_AUTOMATIC   (0x1)
 
-        PADD32(2);
+        PADD32[2];
 
         ioport32_t clksel1_pll;

uspace/drv/infrastructure/rootamdm37x/core_cm.h

@@ -36 +36 @@
 #define AMDM37x_CORE_CM_H
 #include <sys/types.h>
+#include <macros.h>
 
 /* AM/DM37x TRM p.447 */
@@ -61 +62 @@
 #define CORE_CM_FCLKEN1_EN_MMC3_FLAG  (1 << 30)
 
-        uint32_t padd0_;
+        PADD32;
         ioport32_t fclken3;
 #define CORE_CM_FCLKEN3_EN_TS_FLAG  (1 << 1)
 #define CORE_CM_FCLKEN3_EN_USBTLL_FLAG  (1 << 2)
 
-        uint32_t padd1_;
+        PADD32;
         ioport32_t iclken1;
 #define CORE_CM_ICLKEN1_EN_SDRC_FLAG  (1 << 1)
@@ -95 +96 @@
 #define CORE_CM_ICLKEN3_EN_USBTLL_FLAG  (1 << 2)
 
-        uint32_t padd2_;
+        PADD32;
         const ioport32_t idlest1;
 #define CORE_CM_IDLEST1_ST_SDRC_FLAG  (1 << 1)
@@ -126 +127 @@
 #define CORE_CM_IDLEST3_ST_USBTLL_FLAG  (1 << 2)
 
-        uint32_t padd3_;
+        PADD32;
         ioport32_t autoidle1;
 #define CORE_CM_AUTOIDLE1_AUTO_HSOTGUSB_FLAG  (1 << 4)
@@ -154 +155 @@
 #define CORE_CM_AUTOIDLE3_AUTO_USBTLL_FLAG  (1 << 2)
 
-        uint32_t padd4_;
+        PADD32;
         ioport32_t clksel;
 #define CORE_CM_CLKSEL_CLKSEL_L3_MASK  (0x3 << 0)
@@ -168 +169 @@
 #define CORE_CM_CLKSEL_CLKSEL_GPT11_FLAG (1 << 7)
 
-        uint32_t padd5_;
+        PADD32;
         ioport32_t clkstctrl;
 #define CORE_CM_CLKCTRL_CLKCTRL_L3_MASK  (0x3 << 0)

uspace/drv/infrastructure/rootamdm37x/uhh.h

@@ -35 +35 @@
 #ifndef AMDM37x_UHH_H
 #define AMDM37x_UHH_H
+#include <macros.h>
 #include <sys/types.h>
 
@@ -45 +46 @@
 #define UHH_REVISION_MAJOR_MASK  0xf0
 
-        uint32_t padd0_[3];
+        PADD32[3];
         ioport32_t sysconfig;
 #define UHH_SYSCONFIG_AUTOIDLE_FLAG  (1 << 0)
@@ -65 +66 @@
 #define UHH_SYSSTATUS_EHCI_RESETDONE_FLAG  (1 << 2)
 
-        uint32_t padd1_[10];
+        PADD32[10];
         ioport32_t hostconfig;
 #define UHH_HOSTCONFIG_P1_ULPI_BYPASS_FLAG  (1 << 0)

uspace/drv/infrastructure/rootamdm37x/usbhost_cm.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)

uspace/drv/infrastructure/rootamdm37x/usbtll.h

@@ -35 +35 @@
 #ifndef AMDM37x_USBTLL_H
 #define AMDM37x_USBTLL_H
+#include <macros.h>
 #include <sys/types.h>
 
@@ -45 +46 @@
 #define TLL_REVISION_MAJOR_MASK  0xf0
 
-        uint32_t padd0_[3];
+        PADD32[3];
         ioport32_t sysconfig;
 #define TLL_SYSCONFIG_AUTOIDLE_FLAG  (1 << 0)
@@ -69 +70 @@
 #define TLL_IRQSTATUS_ACCESS_ERROR_EN_FLAG  (1 << 2)
 
-        uint32_t padd1_[4];
+        PADD32[4];
         ioport32_t shared_conf;
 #define TLL_SHARED_CONF_FCLK_IS_ON_FLAG  (1 << 0)
@@ -78 +79 @@
 #define TLL_SHARED_CONF_USB_90D_DDR_EN_FLAG  (1 << 6)
 
-        uint32_t padd2_[3];
+        PADD32[3];
         ioport32_t channel_conf[3];
 #define TLL_CHANNEL_CONF_CHANEN_FLAG  (1 << 0)

uspace/lib/c/include/macros.h

@@ -62 +62 @@
 #define _paddname(line) PADD_ ## line ## __
 #define _padd(width, line) uint ## width ## _t _paddname(line)
-#define PADD32(count) _padd(32, __LINE__)[count]
-#define PADD16(count) _padd(16, __LINE__)[count]
-#define PADD8(count) _padd(8, __LINE__)[count]
+#define PADD32 _padd(32, __LINE__)
+#define PADD16 _padd(16, __LINE__)
+#define PADD8 _padd(8, __LINE__)
 
 /** @}