diff options
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c | 18 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_internal.h | 2 | ||||
| -rwxr-xr-x | nuttx/configs/nucleus2g/ostest/setenv.sh | 4 | ||||
| -rw-r--r-- | nuttx/tools/mkconfig.c | 3 |
4 files changed, 13 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c index 5ff6ab9dc..aa2e855f5 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c @@ -49,7 +49,7 @@ #include "lpc17_gpio.h" #include "lpc17_internal.h" -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_GPIO /**************************************************************************** * Pre-processor Definitions @@ -134,22 +134,22 @@ int lpc17_dumpgpio(uint16_t pinset, const char *msg) port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT; pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; - pinsel = lpc17_pinsel(port); - pinmode = lpc17_pinmode(port); + pinsel = lpc17_pinsel(port, pin); + pinmode = lpc17_pinmode(port, pin); /* The following requires exclusive access to the GPIO registers */ flags = irqsave(); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", - port + '0', pinset, fiobase, msg); + lldbg("GPIO%c pinset: %08x -- %s\n", + port + '0', pinset, msg); - lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n" + lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", pinsel, pinsel ? getreg32(pinsel) : 0, pinmode, pinmode ? getreg32(pinmode) : 0, g_odmode[port], getreg32(g_odmode[port])); base = g_fiobase[port]; - lldbg(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n" + lldbg(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n", base+LPC17_FIO_DIR_OFFSET, getreg32(base+LPC17_FIO_DIR_OFFSET), base+LPC17_FIO_MASK_OFFSET, getreg32(base+LPC17_FIO_MASK_OFFSET), base+LPC17_FIO_PIN_OFFSET, getreg32(base+LPC17_FIO_PIN_OFFSET)); @@ -165,7 +165,5 @@ int lpc17_dumpgpio(uint16_t pinset, const char *msg) irqrestore(flags); return OK; } -#endif /* CONFIG_DEBUG */ - - +#endif /* CONFIG_DEBUG_GPIO */ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h b/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h index 7d9e36bf4..e3a1c64f5 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_internal.h @@ -537,7 +537,7 @@ EXTERN void lpc17_gpioirqdisable(int irq); ************************************************************************************/ #ifdef CONFIG_DEBUG_GPIO -EXTERN int lpc17_dumpgpio(uint32_t pinset, const char *msg); +EXTERN int lpc17_dumpgpio(uint16_t pinset, const char *msg); #else # define lpc17_dumpgpio(p,m) #endif diff --git a/nuttx/configs/nucleus2g/ostest/setenv.sh b/nuttx/configs/nucleus2g/ostest/setenv.sh index 0c303bfd5..32d3b23c1 100755 --- a/nuttx/configs/nucleus2g/ostest/setenv.sh +++ b/nuttx/configs/nucleus2g/ostest/setenv.sh @@ -40,8 +40,8 @@ fi if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi WD=`pwd` -export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin" +export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools" export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin" -export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" +export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c index efaa29a21..1569daf85 100644 --- a/nuttx/tools/mkconfig.c +++ b/nuttx/tools/mkconfig.c @@ -1,7 +1,7 @@ /**************************************************************************** * tools/mkconfig.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -337,6 +337,7 @@ int main(int argc, char **argv, char **envp) printf("# undef CONFIG_DEBUG_NET\n"); printf("# undef CONFIG_DEBUG_USB\n"); printf("# undef CONFIG_DEBUG_GRAPHICS\n"); + printf("# undef CONFIG_DEBUG_GPIO\n"); printf("#endif\n\n"); printf("#endif /* __ARCH_CONFIG_H */\n"); fclose(stream); |