From b5a5ba0335a35555f062f7604377339552454886 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 27 Feb 2013 15:16:46 +0000 Subject: Fix NuTiny-SDK-NUC120 LEDs git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5679 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/open1788/src/lpc17_autoleds.c | 16 ++++++---------- nuttx/configs/open1788/src/lpc17_userleds.c | 24 +++++++++++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) (limited to 'nuttx/configs/open1788/src') diff --git a/nuttx/configs/open1788/src/lpc17_autoleds.c b/nuttx/configs/open1788/src/lpc17_autoleds.c index 66cfc1734..80d682df5 100644 --- a/nuttx/configs/open1788/src/lpc17_autoleds.c +++ b/nuttx/configs/open1788/src/lpc17_autoleds.c @@ -134,29 +134,25 @@ #define LED_IDLE_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_IDLE_OFF_CLRBITS ((OPEN1788_LED4) << OFF_CLRBITS_SHIFT) -/* Enables debug output from this file (needs CONFIG_DEBUG with - * CONFIG_DEBUG_VERBOSE too) +/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG + * with CONFIG_DEBUG_VERBOSE too) */ -#undef LED_DEBUG /* Define to enable debug */ -#undef LED_VERBOSE /* Define to enable verbose debug */ - -#ifdef LED_DEBUG -# define leddbg lldbg -# ifdef LED_VERBOSE +#ifdef CONFIG_DEBUG_LEDS +# define leddbg lldbg +# ifdef CONFIG_DEBUG_VERBOSE # define ledvdbg lldbg # else # define ledvdbg(x...) # endif #else -# undef LED_VERBOSE # define leddbg(x...) # define ledvdbg(x...) #endif /* Dump GPIO registers */ -#ifdef LED_VERBOSE +#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS) # define led_dumpgpio(m) lpc17_dumpgpio(???, m) #else # define led_dumpgpio(m) diff --git a/nuttx/configs/open1788/src/lpc17_userleds.c b/nuttx/configs/open1788/src/lpc17_userleds.c index dacea5a1c..bf0300e25 100644 --- a/nuttx/configs/open1788/src/lpc17_userleds.c +++ b/nuttx/configs/open1788/src/lpc17_userleds.c @@ -60,20 +60,30 @@ * Definitions ****************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG with - * CONFIG_DEBUG_VERBOSE too) +/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG + * with CONFIG_DEBUG_VERBOSE too) */ -#undef LED_DEBUG /* Define to enable debug */ - -#ifdef LED_DEBUG -# define leddbg lldbg -# define ledvdbg llvdbg +#ifdef CONFIG_DEBUG_LEDS +# define leddbg lldbg +# ifdef CONFIG_DEBUG_VERBOSE +# define ledvdbg lldbg +# else +# define ledvdbg(x...) +# endif #else # define leddbg(x...) # define ledvdbg(x...) #endif +/* Dump GPIO registers */ + +#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS) +# define led_dumpgpio(m) lpc17_dumpgpio(???, m) +#else +# define led_dumpgpio(m) +#endif + /**************************************************************************** * Private Data ****************************************************************************/ -- cgit v1.2.3