From 66fc92f59e4084677ddbd12a0b9d41d9ab2615a8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Apr 2013 18:12:44 -0600 Subject: Move LPC17xx IOCON register definitions from lpc17_gpio.h to lpc17_iocon.h; fix a few more .gitignore files --- nuttx/arch/arm/src/.gitignore | 10 +++++----- nuttx/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h | 8 ++++++++ nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c | 14 +++++++------- nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.h | 8 +------- 4 files changed, 21 insertions(+), 19 deletions(-) (limited to 'nuttx/arch/arm/src') diff --git a/nuttx/arch/arm/src/.gitignore b/nuttx/arch/arm/src/.gitignore index 11ae4f83b..d9a7dec41 100644 --- a/nuttx/arch/arm/src/.gitignore +++ b/nuttx/arch/arm/src/.gitignore @@ -1,6 +1,6 @@ -.depend -Make.dep -locked.r -board -chip +/.depend +/Make.dep +/locked.r +/board +/chip diff --git a/nuttx/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h b/nuttx/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h index e584adad6..2891b5827 100755 --- a/nuttx/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h +++ b/nuttx/arch/arm/src/lpc17xx/chip/lpc178x_iocon.h @@ -336,6 +336,14 @@ #define IOCON_MODE_PU (2) /* 10: pin has a pull-up resistor enabled */ #define IOCON_MODE_RM (3) /* 11: pin has repeater mode enabled */ +/* Pin types */ + +#define IOCON_TYPE_D_MASK (0x0000067f) /* All ports except where ADC/DAC, USB, I2C is present */ +#define IOCON_TYPE_A_MASK (0x000105df) /* USB/ADC/DAC P0:12-13, P0:23-26, P1:30-31 */ +#define IOCON_TYPE_U_MASK (0x00000007) /* USB P0:29 to 31 */ +#define IOCON_TYPE_I_MASK (0x00000347) /* I2C/USB P0:27-28, P5:2-3 */ +#define IOCON_TYPE_W_MASK (0x000007ff) /* I2S P0:7-9 */ + /************************************************************************************ * Public Types ************************************************************************************/ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c index 544c608a4..fc9f477ae 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.c @@ -137,7 +137,7 @@ static int lpc17_configiocon(unsigned int port, unsigned int pin, { uint32_t regaddr; uint32_t regval; - uint32_t typemask = GPIO_IOCON_TYPE_D_MASK; + uint32_t typemask = IOCON_TYPE_D_MASK; /* Select the mask based on pin usage */ @@ -149,7 +149,7 @@ static int lpc17_configiocon(unsigned int port, unsigned int pin, case 7: case 8: case 9: - typemask = GPIO_IOCON_TYPE_W_MASK; + typemask = IOCON_TYPE_W_MASK; break; case 12: @@ -158,18 +158,18 @@ static int lpc17_configiocon(unsigned int port, unsigned int pin, case 24: case 25: case 26: - typemask = GPIO_IOCON_TYPE_A_MASK; + typemask = IOCON_TYPE_A_MASK; break; case 27: case 28: - typemask = GPIO_IOCON_TYPE_I_MASK; + typemask = IOCON_TYPE_I_MASK; break; case 29: case 30: case 31: - typemask = GPIO_IOCON_TYPE_U_MASK; + typemask = IOCON_TYPE_U_MASK; break; default: @@ -182,7 +182,7 @@ static int lpc17_configiocon(unsigned int port, unsigned int pin, { case 30: case 31: - typemask = GPIO_IOCON_TYPE_A_MASK; + typemask = IOCON_TYPE_A_MASK; break; default: @@ -195,7 +195,7 @@ static int lpc17_configiocon(unsigned int port, unsigned int pin, { case 2: case 3: - typemask = GPIO_IOCON_TYPE_I_MASK; + typemask = IOCON_TYPE_I_MASK; break; default: diff --git a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.h b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.h index 842cb569a..8005425b1 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc178x_gpio.h @@ -57,15 +57,9 @@ */ /* Special Pin Functions - * For pins that has ADC/DAC, USB, I2C + * For pins that have ADC/DAC, USB, I2C */ -#define GPIO_IOCON_TYPE_D_MASK (0x0000067f) /* All port except where ADC/DAC, USB, I2C is present */ -#define GPIO_IOCON_TYPE_A_MASK (0x000105df) /* USB/ADC/DAC P0:12-13, P0:23-26, P1:30-31 */ -#define GPIO_IOCON_TYPE_U_MASK (0x00000007) /* USB P0:29 to 31 */ -#define GPIO_IOCON_TYPE_I_MASK (0x00000347) /* I2C/USB P0:27-28, P5:2-3 */ -#define GPIO_IOCON_TYPE_W_MASK (0x000007ff) /* I2S P0:7-9 */ - #define GPIO_IOCON_MASK (0x00ff0000) # define GPIO_HYSTERESIS (1 << 16) /* Bit 16: HYSTERESIS: 0-Disable, 1-Enabled */ # define GPIO_INVERT (1 << 17) /* Bit 17: Input: 0-Not Inverted, 1-Inverted */ -- cgit v1.2.3