diff options
24 files changed, 96 insertions, 109 deletions
diff --git a/apps/examples/elf/tests/.gitignore b/apps/examples/elf/tests/.gitignore index b54b4dcff..0262e38a3 100644 --- a/apps/examples/elf/tests/.gitignore +++ b/apps/examples/elf/tests/.gitignore @@ -1,10 +1,7 @@ -romfs -romfs.h -romfs.img -dirlist.h -symtab.c -varlist.tmp - - - +/romfs +/romfs.h +/romfs.img +/dirlist.h +/symtab.c +/varlist.tmp diff --git a/apps/examples/nxflat/tests/.gitignore b/apps/examples/nxflat/tests/.gitignore index 3a5a640ce..d66f62e1b 100644 --- a/apps/examples/nxflat/tests/.gitignore +++ b/apps/examples/nxflat/tests/.gitignore @@ -1,6 +1,6 @@ -romfs -romfs.h -romfs.img -dirlist.h -symtab.h +/romfs +/romfs.h +/romfs.img +/dirlist.h +/symtab.h diff --git a/apps/examples/posix_spawn/filesystem/.gitignore b/apps/examples/posix_spawn/filesystem/.gitignore index 93a81072d..23504a6af 100644 --- a/apps/examples/posix_spawn/filesystem/.gitignore +++ b/apps/examples/posix_spawn/filesystem/.gitignore @@ -1,9 +1,5 @@ -romfs -romfs.h -romfs.img -symtab.c - - - - +/romfs +/romfs.h +/romfs.img +/symtab.c diff --git a/apps/examples/thttpd/content/.gitignore b/apps/examples/thttpd/content/.gitignore index b910a2519..37d8c92fb 100644 --- a/apps/examples/thttpd/content/.gitignore +++ b/apps/examples/thttpd/content/.gitignore @@ -1,5 +1,5 @@ -romfs -romfs.h -romfs.img -symtab.h +/romfs +/romfs.h +/romfs.img +/symtab.h diff --git a/nuttx/arch/arm/include/.gitignore b/nuttx/arch/arm/include/.gitignore index 06655cab4..e6460c4a6 100644 --- a/nuttx/arch/arm/include/.gitignore +++ b/nuttx/arch/arm/include/.gitignore @@ -1,3 +1,3 @@ -board -chip +/board +/chip 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 */ diff --git a/nuttx/arch/avr/include/.gitignore b/nuttx/arch/avr/include/.gitignore index 06655cab4..e6460c4a6 100644 --- a/nuttx/arch/avr/include/.gitignore +++ b/nuttx/arch/avr/include/.gitignore @@ -1,3 +1,3 @@ -board -chip +/board +/chip diff --git a/nuttx/arch/avr/src/.gitignore b/nuttx/arch/avr/src/.gitignore index 11ae4f83b..d9a7dec41 100644 --- a/nuttx/arch/avr/src/.gitignore +++ b/nuttx/arch/avr/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/hc/include/.gitignore b/nuttx/arch/hc/include/.gitignore index 8c2073f4c..8b8a2b105 100644 --- a/nuttx/arch/hc/include/.gitignore +++ b/nuttx/arch/hc/include/.gitignore @@ -1,4 +1,3 @@ -chip -board - +/chip +/board diff --git a/nuttx/arch/hc/src/.gitignore b/nuttx/arch/hc/src/.gitignore index 50d82248d..b5d295dd6 100644 --- a/nuttx/arch/hc/src/.gitignore +++ b/nuttx/arch/hc/src/.gitignore @@ -1,7 +1,6 @@ -.depend -Make.dep -board -chip -*.r - +/.depend +/Make.dep +/board +/chip +/*.r diff --git a/nuttx/arch/mips/include/.gitignore b/nuttx/arch/mips/include/.gitignore index dc63921a6..e6460c4a6 100644 --- a/nuttx/arch/mips/include/.gitignore +++ b/nuttx/arch/mips/include/.gitignore @@ -1,4 +1,3 @@ -board -chip - +/board +/chip diff --git a/nuttx/arch/mips/src/.gitignore b/nuttx/arch/mips/src/.gitignore index 8200050d1..6a1830c0e 100644 --- a/nuttx/arch/mips/src/.gitignore +++ b/nuttx/arch/mips/src/.gitignore @@ -1,6 +1,6 @@ -.depend -Make.dep -board -chip +/.depend +/Make.dep +/board +/chip diff --git a/nuttx/arch/rgmp/include/.gitignore b/nuttx/arch/rgmp/include/.gitignore index dc63921a6..e6460c4a6 100644 --- a/nuttx/arch/rgmp/include/.gitignore +++ b/nuttx/arch/rgmp/include/.gitignore @@ -1,4 +1,3 @@ -board -chip - +/board +/chip diff --git a/nuttx/arch/rgmp/src/.gitignore b/nuttx/arch/rgmp/src/.gitignore index 8200050d1..83210e8c1 100644 --- a/nuttx/arch/rgmp/src/.gitignore +++ b/nuttx/arch/rgmp/src/.gitignore @@ -1,6 +1,5 @@ -.depend -Make.dep -board -chip - +/.depend +/Make.dep +/board +/chip diff --git a/nuttx/arch/sim/include/.gitignore b/nuttx/arch/sim/include/.gitignore index b4b4afafb..12c22f4f2 100644 --- a/nuttx/arch/sim/include/.gitignore +++ b/nuttx/arch/sim/include/.gitignore @@ -1,2 +1,2 @@ -board +/board diff --git a/nuttx/arch/sim/src/.gitignore b/nuttx/arch/sim/src/.gitignore index 0fea57065..b5b31ec94 100644 --- a/nuttx/arch/sim/src/.gitignore +++ b/nuttx/arch/sim/src/.gitignore @@ -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 diff --git a/nuttx/arch/x86/include/.gitignore b/nuttx/arch/x86/include/.gitignore index 8c2073f4c..8b8a2b105 100644 --- a/nuttx/arch/x86/include/.gitignore +++ b/nuttx/arch/x86/include/.gitignore @@ -1,4 +1,3 @@ -chip -board - +/chip +/board diff --git a/nuttx/arch/x86/src/.gitignore b/nuttx/arch/x86/src/.gitignore index 609a19c09..a80d8bd37 100644 --- a/nuttx/arch/x86/src/.gitignore +++ b/nuttx/arch/x86/src/.gitignore @@ -1,5 +1,5 @@ -chip -board -.depend -Make.dep +/chip +/board +/.depend +/Make.dep diff --git a/nuttx/arch/z16/src/.gitignore b/nuttx/arch/z16/src/.gitignore index bfbab21d3..d61ab1f9b 100644 --- a/nuttx/arch/z16/src/.gitignore +++ b/nuttx/arch/z16/src/.gitignore @@ -1,8 +1,8 @@ -Make.dep -.depend -board -chip -nuttx.linkcmd +/Make.dep +/.depend +/board +/chip +/nuttx.linkcmd *.asm *.obj *.lib diff --git a/nuttx/arch/z80/include/.gitignore b/nuttx/arch/z80/include/.gitignore index dc63921a6..e6460c4a6 100644 --- a/nuttx/arch/z80/include/.gitignore +++ b/nuttx/arch/z80/include/.gitignore @@ -1,4 +1,3 @@ -board -chip - +/board +/chip diff --git a/nuttx/arch/z80/src/.gitignore b/nuttx/arch/z80/src/.gitignore index a61725d0c..22342dd6d 100644 --- a/nuttx/arch/z80/src/.gitignore +++ b/nuttx/arch/z80/src/.gitignore @@ -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 - |