From 94682f93901a5ca2ecd1994e743db61a3af786ca Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 23 Jul 2010 18:06:33 +0000 Subject: [PATCH] cleanup git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2813 42af7a65-404d-4744-a932-0658087f49c3 --- arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h | 39 +++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h b/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h index cea42a225c..62bc5f0fab 100755 --- a/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h +++ b/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h @@ -48,7 +48,18 @@ ************************************************************************************/ /* Register Offsets *****************************************************************/ +/* Friendly names for ports */ +#define PIM_PORTT (0) +#define PIM_PORTS (1) +#define PIM_PORTG (2) +#define PIM_PORTH (3) +#define PIM_PORTJ (4) +#define PIM_PORTL (5) + +/* Port register block offsets */ + +#define HCS12_PIM_PORT_OFFSET(n) (HCS12_PIM_BASE + ((n) << 3)) #define HCS12_PIM_PORTT_OFFSET (0x0000) #define HCS12_PIM_PORTS_OFFSET (0x0008) #define HCS12_PIM_PORTG_OFFSET (0x0010) @@ -56,6 +67,8 @@ #define HCS12_PIM_PORTJ_OFFSET (0x0020) #define HCS12_PIM_PORTL_OFFSET (0x0028) +/* Register offsets within a port register block */ + #define HCS12_PIM_IO_OFFSET (0x0000) /* I/O Register (ALL) */ #define HCS12_PIM_INPUT_OFFSET (0x0001) /* Input Register (ALL) */ #define HCS12_PIM_DDR_OFFSET (0x0002) /* Data Direction Register (ALL) */ @@ -67,15 +80,9 @@ #define HCS12_PIM_IF_OFFSET (0x0007) /* Interrupt Flag Register (PORT G, H, and J) */ /* Register Addresses ***************************************************************/ +/* Port register block addresses */ -#define PIM_PORTT (0) -#define PIM_PORTS (1) -#define PIM_PORTG (2) -#define PIM_PORTH (3) -#define PIM_PORTJ (4) -#define PIM_PORTL (5) - -#define HCS12_PIM_PORT_BASE(n) (HCS12_PIM_BASE + 0x0008*(n)) +#define HCS12_PIM_PORT_BASE(n) (HCS12_PIM_BASE + HCS12_PIM_PORT_OFFSET(n)) #define HCS12_PIM_PORTT_BASE (HCS12_PIM_BASE + HCS12_PIM_PORTT_OFFSET) #define HCS12_PIM_PORTS_BASE (HCS12_PIM_BASE + HCS12_PIM_PORTS_OFFSET) #define HCS12_PIM_PORTG_BASE (HCS12_PIM_BASE + HCS12_PIM_PORTG_OFFSET) @@ -83,6 +90,8 @@ #define HCS12_PIM_PORTJ_BASE (HCS12_PIM_BASE + HCS12_PIM_PORTJ_OFFSET) #define HCS12_PIM_PORTL_BASE (HCS12_PIM_BASE + HCS12_PIM_PORTL_OFFSET) +/* Port register addresses */ + #define HCS12_PIM_PORT_IO(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORT_INPUT(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORT_DDR(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_DDR_OFFSET) @@ -92,6 +101,8 @@ #define HCS12_PIM_PORT_IE(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_IE_OFFSET) #define HCS12_PIM_PORT_IF(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_IF_OFFSET) +/* Port T register addresses */ + #define HCS12_PIM_PORTT_IO (HCS12_PIM_PORTT_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTT_INPUT (HCS12_PIM_PORTT_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTT_DDR (HCS12_PIM_PORTT_BASE + HCS12_PIM_DDR_OFFSET) @@ -99,6 +110,8 @@ #define HCS12_PIM_PORTT_PER (HCS12_PIM_PORTT_BASE + HCS12_PIM_PER_OFFSET) #define HCS12_PIM_PORTT_PS (HCS12_PIM_PORTT_BASE + HCS12_PIM_PS_OFFSET) +/* Port S register addresses */ + #define HCS12_PIM_PORTS_IO (HCS12_PIM_PORTS_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTS_INPUT (HCS12_PIM_PORTS_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTS_DDR (HCS12_PIM_PORTS_BASE + HCS12_PIM_DDR_OFFSET) @@ -107,6 +120,8 @@ #define HCS12_PIM_PORTS_PS (HCS12_PIM_PORTS_BASE + HCS12_PIM_PS_OFFSET) #define HCS12_PIM_PORTS_WOM (HCS12_PIM_PORTS_BASE + HCS12_PIM_WOM_OFFSET) +/* Port G register addresses */ + #define HCS12_PIM_PORTG_IO (HCS12_PIM_PORTG_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTG_INPUT (HCS12_PIM_PORTG_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTG_DDR (HCS12_PIM_PORTG_BASE + HCS12_PIM_DDR_OFFSET) @@ -116,6 +131,8 @@ #define HCS12_PIM_PORTG_IE (HCS12_PIM_PORTG_BASE + HCS12_PIM_IE_OFFSET) #define HCS12_PIM_PORTG_IF (HCS12_PIM_PORTG_BASE + HCS12_PIM_IF_OFFSET) +/* Port H register addresses */ + #define HCS12_PIM_PORTH_IO (HCS12_PIM_PORTH_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTH_INPUT (HCS12_PIM_PORTH_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTH_DDR (HCS12_PIM_PORTH_BASE + HCS12_PIM_DDR_OFFSET) @@ -125,6 +142,8 @@ #define HCS12_PIM_PORTH_IE (HCS12_PIM_PORTH_BASE + HCS12_PIM_IE_OFFSET) #define HCS12_PIM_PORTH_IF (HCS12_PIM_PORTH_BASE + HCS12_PIM_IF_OFFSET) +/* Port J register addresses */ + #define HCS12_PIM_PORTJ_IO (HCS12_PIM_PORTJ_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTJ_INPUT (HCS12_PIM_PORTJ_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTJ_DDR (HCS12_PIM_PORTJ_BASE + HCS12_PIM_DDR_OFFSET) @@ -134,6 +153,8 @@ #define HCS12_PIM_PORTJ_IE (HCS12_PIM_PORTJ_BASE + HCS12_PIM_IE_OFFSET) #define HCS12_PIM_PORTJ_IF (HCS12_PIM_PORTJ_BASE + HCS12_PIM_IF_OFFSET) +/* Port L register addresses */ + #define HCS12_PIM_PORTL_IO (HCS12_PIM_PORTL_BASE + HCS12_PIM_IO_OFFSET) #define HCS12_PIM_PORTL_INPUT (HCS12_PIM_PORTL_BASE + HCS12_PIM_INPUT_OFFSET) #define HCS12_PIM_PORTL_DDR (HCS12_PIM_PORTL_BASE + HCS12_PIM_DDR_OFFSET) @@ -144,7 +165,7 @@ /* Register Bit Definitions *********************************************************/ -/* Port register bits */ +/* Port register bits (all ports) */ #define PIM_PIN(n) (1 << (n)) #define PIM_PIN0 (1 << 0)