sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move LPC17xx IOCON register definitions from lpc17_gpio.h to lpc17_iocon.h; fix a few more .gitignore files

Browse Source
This commit is contained in:
Gregory Nutt 2013-04-04 18:12:44 -06:00
parent db78b76102
commit e94faba7f5
20 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/.gitignore vendored
View File

@ -1,3 +1,3 @@
board
chip
/board
/chip

10
arch/arm/src/.gitignore vendored
View File

@ -1,6 +1,6 @@
.depend
Make.dep
locked.r
board
chip
/.depend
/Make.dep
/locked.r
/board
/chip

8
arch/arm/src/lpc17xx/chip/lpc178x_iocon.h
View File

@ -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
************************************************************************************/

14
arch/arm/src/lpc17xx/lpc178x_gpio.c
View File

@ -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:

8
arch/arm/src/lpc17xx/lpc178x_gpio.h
View File

@ -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 */

4
arch/avr/include/.gitignore vendored
View File

@ -1,3 +1,3 @@
board
chip
/board
/chip

10
arch/avr/src/.gitignore vendored
View File

@ -1,6 +1,6 @@
.depend
Make.dep
locked.r
board
chip
/.depend
/Make.dep
/locked.r
/board
/chip

5
arch/hc/include/.gitignore vendored
View File

@ -1,4 +1,3 @@
chip
board
/chip
/board

11
arch/hc/src/.gitignore vendored
View File

@ -1,7 +1,6 @@
.depend
Make.dep
board
chip
*.r
/.depend
/Make.dep
/board
/chip
/*.r

5
arch/mips/include/.gitignore vendored
View File

@ -1,4 +1,3 @@
board
chip
/board
/chip

8
arch/mips/src/.gitignore vendored
View File

@ -1,6 +1,6 @@
.depend
Make.dep
board
chip
/.depend
/Make.dep
/board
/chip

5
arch/rgmp/include/.gitignore vendored
View File

@ -1,4 +1,3 @@
board
chip
/board
/chip

9
arch/rgmp/src/.gitignore vendored
View File

@ -1,6 +1,5 @@
.depend
Make.dep
board
chip
/.depend
/Make.dep
/board
/chip

2
arch/sim/include/.gitignore vendored
View File

@ -1,2 +1,2 @@
board
/board

16
arch/sim/src/.gitignore vendored
View File

@ -1,9 +1,9 @@
Make.dep
.depend
Cygwin-names.dat
Linux-names.dat
nuttx.rel
GNU
chip
board
/Make.dep
/.depend
/Cygwin-names.dat
/Linux-names.dat
/nuttx.rel
/GNU
/chip
/board

5
arch/x86/include/.gitignore vendored
View File

@ -1,4 +1,3 @@
chip
board
/chip
/board

8
arch/x86/src/.gitignore vendored
View File

@ -1,5 +1,5 @@
chip
board
.depend
Make.dep
/chip
/board
/.depend
/Make.dep

10
arch/z16/src/.gitignore vendored
View File

@ -1,8 +1,8 @@
Make.dep
.depend
board
chip
nuttx.linkcmd
/Make.dep
/.depend
/board
/chip
/nuttx.linkcmd
*.asm
*.obj
*.lib

5
arch/z80/include/.gitignore vendored
View File

@ -1,4 +1,3 @@
board
chip
/board
/chip

13
arch/z80/src/.gitignore vendored
View File

@ -1,9 +1,9 @@
Make.dep
.depend
up_mem.h
asm_mem.h
board
chip
/Make.dep
/.depend
/up_mem.h
/asm_mem.h
/board
/chip
*.sym
*.asm
*.obj
@ -21,4 +21,3 @@ chip
*.linkcmd
*.noi