From 2ddd57c6744b3873c92be3dfd67e2c0b37a72c05 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 15 Jun 2016 14:12:19 -0600 Subject: [PATCH] Centralize definitions associated with CONFIG_DEBUG_LEDS --- Kconfig | 36 ++++++++++-- configs/arduino-due/src/sam_autoleds.c | 20 ------- configs/arduino-due/src/sam_userleds.c | 32 ----------- .../cc3200-launchpad/src/cc3200_autoleds.c | 22 +------- configs/cloudctrl/src/stm32_autoleds.c | 12 ---- configs/cloudctrl/src/stm32_userleds.c | 20 ------- configs/demo9s12ne64/src/m9s12_leds.c | 24 -------- configs/dk-tm4c129x/src/tm4c_userleds.c | 16 ------ configs/ea3131/src/lpc31_leds.c | 24 -------- configs/ea3152/src/lpc31_leds.c | 24 -------- configs/eagle100/src/lm_leds.c | 20 +------ configs/efm32-g8xx-stk/src/efm32_autoleds.c | 12 ---- configs/efm32-g8xx-stk/src/efm32_userleds.c | 16 ------ configs/efm32gg-stk3700/src/efm32_autoleds.c | 24 -------- configs/efm32gg-stk3700/src/efm32_userleds.c | 16 ------ configs/ekk-lm3s9b96/src/lm_leds.c | 20 +------ configs/fire-stm32v2/src/stm32_autoleds.c | 12 ---- configs/fire-stm32v2/src/stm32_userleds.c | 20 ------- configs/freedom-kl25z/src/kl_led.c | 26 +-------- configs/freedom-kl26z/src/kl_led.c | 26 +-------- configs/hymini-stm32v/src/stm32_leds.c | 20 +++---- configs/kwikstik-k40/src/k40_leds.c | 18 ------ .../launchxl-tms57004/src/tms570_autoleds.c | 16 ------ configs/lincoln60/src/lpc17_leds.c | 18 +----- configs/lm3s6432-s2e/src/lm_leds.c | 14 +---- configs/lm3s6965-ek/src/lm_leds.c | 10 +--- configs/lm3s8962-ek/src/lm_leds.c | 10 +--- configs/lm4f120-launchpad/src/lm4f_autoleds.c | 22 +------- configs/lpc4330-xplorer/src/lpc43_autoleds.c | 27 --------- configs/lpc4330-xplorer/src/lpc43_userleds.c | 24 -------- configs/lpc4357-evb/src/lpc43_autoleds.c | 24 -------- configs/lpc4357-evb/src/lpc43_userleds.c | 24 -------- configs/lpc4370-link2/src/lpc43_autoleds.c | 28 ---------- configs/lpc4370-link2/src/lpc43_userleds.c | 30 ---------- configs/lpcxpresso-lpc1115/src/lpc11_leds.c | 24 -------- configs/lpcxpresso-lpc1768/src/lpc17_leds.c | 24 -------- configs/maple/src/stm32_leds.c | 20 ------- configs/mbed/src/lpc17_leds.c | 18 +----- configs/mirtoo/src/pic32_leds.c | 16 ------ configs/moteino-mega/src/avr_leds.c | 24 -------- configs/ne64badge/src/m9s12_leds.c | 18 +----- configs/nucleo-144/src/stm32_autoleds.c | 12 ---- configs/nucleo-144/src/stm32_userleds.c | 12 ---- configs/nucleo-f303re/src/stm32_autoleds.c | 28 ---------- configs/nucleo-f303re/src/stm32_userleds.c | 16 ------ configs/nucleo-f4x1re/src/stm32_autoleds.c | 24 -------- configs/nucleo-f4x1re/src/stm32_userleds.c | 20 ------- configs/nucleo-l476rg/src/stm32_autoleds.c | 24 -------- configs/nucleo-l476rg/src/stm32_userleds.c | 20 ------- configs/nutiny-nuc120/src/nuc_led.c | 26 +-------- configs/olimex-lpc-h3131/src/lpc31_leds.c | 24 -------- configs/olimex-lpc1766stk/src/lpc17_leds.c | 18 +----- .../olimex-stm32-h405/src/stm32_autoleds.c | 24 -------- .../olimex-stm32-h405/src/stm32_userleds.c | 16 ------ .../olimex-stm32-h407/src/stm32_autoleds.c | 16 ------ .../olimex-stm32-h407/src/stm32_userleds.c | 16 ------ .../olimex-stm32-p207/src/stm32_autoleds.c | 12 ---- .../olimex-stm32-p207/src/stm32_userleds.c | 16 ------ configs/olimexino-stm32/src/stm32_leds.c | 18 +----- configs/open1788/src/lpc17_autoleds.c | 18 +----- configs/open1788/src/lpc17_userleds.c | 18 +----- configs/pcduino-a10/src/a1x_leds.c | 23 -------- configs/pic32mx-starterkit/src/pic32mx_leds.c | 16 ------ configs/pic32mx7mmb/src/pic32_leds.c | 16 ------ .../pic32mz-starterkit/src/pic32mz_autoleds.c | 16 ------ .../pic32mz-starterkit/src/pic32mz_userleds.c | 19 ------- configs/sabre-6quad/src/imx_autoleds.c | 16 ------ configs/sam3u-ek/src/sam_leds.c | 12 ---- configs/sam4e-ek/src/sam_leds.c | 12 ---- configs/sam4l-xplained/src/sam_autoleds.c | 24 -------- configs/sam4l-xplained/src/sam_userleds.c | 16 ------ configs/sam4s-xplained-pro/src/sam_autoleds.c | 23 -------- configs/sam4s-xplained-pro/src/sam_userleds.c | 16 ------ configs/sam4s-xplained/src/sam_autoleds.c | 23 -------- configs/sam4s-xplained/src/sam_userleds.c | 16 ------ configs/sama5d2-xult/src/sam_autoleds.c | 24 -------- configs/sama5d2-xult/src/sam_userleds.c | 16 ------ configs/sama5d3-xplained/src/sam_autoleds.c | 24 -------- configs/sama5d3-xplained/src/sam_userleds.c | 16 ------ configs/sama5d3x-ek/src/sam_autoleds.c | 24 -------- configs/sama5d3x-ek/src/sam_userleds.c | 16 ------ configs/sama5d4-ek/src/sam_autoleds.c | 24 -------- configs/sama5d4-ek/src/sam_userleds.c | 16 ------ configs/samd20-xplained/src/sam_autoleds.c | 24 -------- configs/samd20-xplained/src/sam_userleds.c | 24 -------- configs/samd21-xplained/src/sam_autoleds.c | 24 -------- configs/samd21-xplained/src/sam_userleds.c | 24 -------- configs/same70-xplained/src/sam_autoleds.c | 24 -------- configs/saml21-xplained/src/sam_autoleds.c | 24 -------- configs/saml21-xplained/src/sam_userleds.c | 24 -------- configs/samv71-xult/src/sam_autoleds.c | 24 -------- configs/shenzhou/src/stm32_autoleds.c | 12 ---- configs/shenzhou/src/stm32_userleds.c | 16 ------ configs/spark/src/stm32_autoleds.c | 12 ---- configs/spark/src/stm32_userleds.c | 16 ------ configs/stm3210e-eval/src/stm32_leds.c | 12 ---- configs/stm3220g-eval/src/stm32_autoleds.c | 12 ---- configs/stm3220g-eval/src/stm32_userleds.c | 16 ------ configs/stm3240g-eval/src/stm32_autoleds.c | 12 ---- configs/stm3240g-eval/src/stm32_userleds.c | 16 ------ configs/stm32_tiny/src/stm32_leds.c | 20 ------- .../stm32f103-minimum/src/stm32_autoleds.c | 16 ------ configs/stm32f3discovery/src/stm32_autoleds.c | 16 ------ configs/stm32f3discovery/src/stm32_userleds.c | 16 ------ configs/stm32f429i-disco/src/stm32_autoleds.c | 12 ---- configs/stm32f429i-disco/src/stm32_userleds.c | 16 ------ configs/stm32f4discovery/src/stm32_autoleds.c | 12 ---- configs/stm32f4discovery/src/stm32_rgbled.c | 10 ---- configs/stm32f4discovery/src/stm32_userleds.c | 16 ------ configs/stm32f746g-disco/src/stm32_autoleds.c | 16 ------ configs/stm32f746g-disco/src/stm32_userleds.c | 16 ------ .../stm32l476vg-disco/src/stm32_autoleds.c | 16 ------ .../stm32l476vg-disco/src/stm32_userleds.c | 16 ------ configs/stm32ldiscovery/src/stm32_autoleds.c | 20 ------- configs/stm32ldiscovery/src/stm32_userleds.c | 16 ------ configs/stm32vldiscovery/src/stm32_leds.c | 16 ------ configs/sure-pic32mx/src/pic32mx_autoleds.c | 16 ------ configs/teensy-2.0/src/at90usb_leds.c | 16 ------ configs/teensy-lc/src/kl_led.c | 28 ---------- .../tm4c123g-launchpad/src/tm4c_autoleds.c | 16 +----- .../tm4c1294-launchpad/src/tm4c_userleds.c | 16 ------ configs/twr-k60n512/src/k60_leds.c | 12 ---- configs/u-blox-c027/src/lpc17_leds.c | 20 ------- configs/ubw32/src/pic32_leds.c | 16 ------ configs/viewtool-stm32f107/src/stm32_leds.c | 20 ------- configs/zkit-arm-1769/src/lpc17_lcd.c | 31 ++-------- configs/zkit-arm-1769/src/lpc17_leds.c | 20 ------- drivers/leds/ncp5623c.c | 40 +++++-------- drivers/leds/pca9635pw.c | 36 ++++-------- drivers/leds/rgbled.c | 26 ++------- drivers/leds/userled_upper.c | 41 ++++---------- include/debug.h | 56 +++++++++++++++++++ 132 files changed, 157 insertions(+), 2456 deletions(-) diff --git a/Kconfig b/Kconfig index 9a22437dda..0e7ccce2ff 100644 --- a/Kconfig +++ b/Kconfig @@ -878,7 +878,7 @@ endif # DEBUG_PAGING comment "Driver Debug Options" config DEBUG_LCD - bool "Low-level LCD Debug Output" + bool "Low-level LCD Debug Features" default n depends on LCD ---help--- @@ -912,13 +912,39 @@ config DEBUG_LCD_INFO endif # DEBUG_LCD config DEBUG_LEDS - bool "Low-level LED Debug Output" + bool "Low-level LED Debug Features" default n depends on ARCH_HAVE_LEDS ---help--- - Enable low level debug from board-specific LED logic. Support for - this debug option is board-specific and may not be available for - some boards. + Enable LED driver debug features. + + Support for this debug option is board-specific and may not + be available for some boards. + +if DEBUG_LEDS + +config DEBUG_LEDS_ERROR + bool "LED Driver Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable LED driver error output to SYSLOG. + +config DEBUG_LEDS_WARN + bool "LED Driver Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable LED driver warning output to SYSLOG. + +config DEBUG_LEDS_INFO + bool "LED Driver Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable LED driver informational output to SYSLOG. + +endif # DEBUG_LEDS config DEBUG_INPUT bool "Input Device Debug Features" diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c index 8fb0ea7104..f3fcdbdca9 100644 --- a/configs/arduino-due/src/sam_autoleds.c +++ b/configs/arduino-due/src/sam_autoleds.c @@ -95,26 +95,6 @@ * at approximately 2Hz, then a fatal error has been detected and the system */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c index f13ddd40cc..2d86511b78 100644 --- a/configs/arduino-due/src/sam_userleds.c +++ b/configs/arduino-due/src/sam_userleds.c @@ -51,38 +51,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Function Protototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c index e515b4536a..26ac6a8aaf 100644 --- a/configs/cc3200-launchpad/src/cc3200_autoleds.c +++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c @@ -87,35 +87,15 @@ * LED_PANIC 4 ON OFF OFF (flashing 2Hz) */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c index c0a82e6fbd..8b91f3699c 100644 --- a/configs/cloudctrl/src/stm32_autoleds.c +++ b/configs/cloudctrl/src/stm32_autoleds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define CLOUDCTRL_LED1 (1 << 0) diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c index 006a62bd45..f2ef6a800a 100644 --- a/configs/cloudctrl/src/stm32_userleds.c +++ b/configs/cloudctrl/src/stm32_userleds.c @@ -54,22 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ @@ -80,10 +64,6 @@ static uint32_t g_ledcfg[BOARD_NLEDS] = GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4 }; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c index 8d11ce1e0e..6f8fd77ebb 100644 --- a/configs/demo9s12ne64/src/m9s12_leds.c +++ b/configs/demo9s12ne64/src/m9s12_leds.c @@ -46,30 +46,6 @@ #include "demo9s12ne64.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c index 9ac0b86d8b..9bac0ab7c2 100644 --- a/configs/dk-tm4c129x/src/tm4c_userleds.c +++ b/configs/dk-tm4c129x/src/tm4c_userleds.c @@ -62,22 +62,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c index dcff8610b5..32ca8940e1 100644 --- a/configs/ea3131/src/lpc31_leds.c +++ b/configs/ea3131/src/lpc31_leds.c @@ -51,30 +51,6 @@ #include "up_internal.h" #include "lpc31.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c index ad0c91bf04..582b1f680a 100644 --- a/configs/ea3152/src/lpc31_leds.c +++ b/configs/ea3152/src/lpc31_leds.c @@ -51,30 +51,6 @@ #include "up_internal.h" #include "lpc31.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c index 86951bfc3e..5163bc9aad 100644 --- a/configs/eagle100/src/lm_leds.c +++ b/configs/eagle100/src/lm_leds.c @@ -55,21 +55,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) @@ -79,16 +67,12 @@ * Private Data ****************************************************************************/ -/**************************************************************************** - * Private Functions - ****************************************************************************/ +static uint8_t g_nest; /**************************************************************************** * Public Functions ****************************************************************************/ -static uint8_t g_nest; - /**************************************************************************** * Name: board_autoled_initialize * diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c index 9038b795e3..086f7f32e4 100644 --- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c @@ -59,18 +59,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define EFM32_LED0 (1 << 0) diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c index ec4ca87c51..31125325eb 100644 --- a/configs/efm32-g8xx-stk/src/efm32_userleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c @@ -55,22 +55,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c index 23cf753454..4500f4e839 100644 --- a/configs/efm32gg-stk3700/src/efm32_autoleds.c +++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c @@ -89,30 +89,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c index 72f808bb31..9e30b55a89 100644 --- a/configs/efm32gg-stk3700/src/efm32_userleds.c +++ b/configs/efm32gg-stk3700/src/efm32_userleds.c @@ -66,22 +66,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c index dff55f504e..f2e4022717 100644 --- a/configs/ekk-lm3s9b96/src/lm_leds.c +++ b/configs/ekk-lm3s9b96/src/lm_leds.c @@ -56,21 +56,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) @@ -80,16 +68,12 @@ * Private Data ****************************************************************************/ -/**************************************************************************** - * Private Functions - ****************************************************************************/ +static uint8_t g_nest; /**************************************************************************** * Public Functions ****************************************************************************/ -static uint8_t g_nest; - /**************************************************************************** * Name: board_autoled_initialize ****************************************************************************/ diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c index 6db2e6aea5..b61c84013b 100644 --- a/configs/fire-stm32v2/src/stm32_autoleds.c +++ b/configs/fire-stm32v2/src/stm32_autoleds.c @@ -57,18 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings. * * OFFBITS ONBITS diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c index 26484ff2e7..a327df7fe8 100644 --- a/configs/fire-stm32v2/src/stm32_userleds.c +++ b/configs/fire-stm32v2/src/stm32_userleds.c @@ -53,22 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ @@ -79,10 +63,6 @@ static uint32_t g_ledcfg[BOARD_NLEDS] = GPIO_LED1, GPIO_LED2, GPIO_LED3 }; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c index dc2a20ee52..19b7a41983 100644 --- a/configs/freedom-kl25z/src/kl_led.c +++ b/configs/freedom-kl25z/src/kl_led.c @@ -81,38 +81,14 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) kl_dumpgpio(GPIO_LED_B, m) #else # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c index 8d4847cda4..3c8d07ab20 100644 --- a/configs/freedom-kl26z/src/kl_led.c +++ b/configs/freedom-kl26z/src/kl_led.c @@ -81,38 +81,14 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) kl_dumpgpio(GPIO_LED_B, m) #else # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c index 0f72b14429..22f724ef1f 100644 --- a/configs/hymini-stm32v/src/stm32_leds.c +++ b/configs/hymini-stm32v/src/stm32_leds.c @@ -57,18 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define HYMINI_STM32_LED1 (1 << 0) @@ -90,48 +78,56 @@ #define OFF_CLRBITS(v) (CLRBITS(OFF_BITS(v)) /* On: !LED1 + !LED2 Off: - */ + #define LED_STARTED_ON_SETBITS ((0) << ON_SETBITS_SHIFT) #define LED_STARTED_ON_CLRBITS ((HYMINI_STM32_LED1|HYMINI_STM32_LED2) << ON_CLRBITS_SHIFT) #define LED_STARTED_OFF_SETBITS (0 << OFF_SETBITS_SHIFT) #define LED_STARTED_OFF_CLRBITS (0 << OFF_CLRBITS_SHIFT) /* On: LED1+!LED2 Off: N/A */ + #define LED_HEAPALLOCATE_ON_SETBITS ((HYMINI_STM32_LED1) << ON_SETBITS_SHIFT) #define LED_HEAPALLOCATE_ON_CLRBITS ((HYMINI_STM32_LED2) << ON_CLRBITS_SHIFT) #define LED_HEAPALLOCATE_OFF_SETBITS (0) #define LED_HEAPALLOCATE_OFF_CLRBITS (0) /* On: LED2+!LED1 Off: N/A */ + #define LED_IRQSENABLED_ON_SETBITS ((HYMINI_STM32_LED2) << ON_SETBITS_SHIFT) #define LED_IRQSENABLED_ON_CLRBITS ((HYMINI_STM32_LED1) << ON_CLRBITS_SHIFT) #define LED_IRQSENABLED_OFF_SETBITS (0) #define LED_IRQSENABLED_OFF_CLRBITS (0) /* On: LED1+!LED2 Off: N/A */ + #define LED_STACKCREATED_ON_SETBITS ((HYMINI_STM32_LED1) << ON_SETBITS_SHIFT) #define LED_STACKCREATED_ON_CLRBITS ((HYMINI_STM32_LED2) << ON_CLRBITS_SHIFT) #define LED_STACKCREATED_OFF_SETBITS (0) #define LED_STACKCREATED_OFF_CLRBITS (0) /* On: !LED1 Off: LED1 */ + #define LED_INIRQ_ON_SETBITS ((0) << ON_SETBITS_SHIFT) #define LED_INIRQ_ON_CLRBITS ((HYMINI_STM32_LED1) << ON_CLRBITS_SHIFT) #define LED_INIRQ_OFF_SETBITS ((HYMINI_STM32_LED1) << OFF_SETBITS_SHIFT) #define LED_INIRQ_OFF_CLRBITS ((0) << OFF_CLRBITS_SHIFT) /* On: LED2 Off: !LED2 */ + #define LED_SIGNAL_ON_SETBITS ((HYMINI_STM32_LED2) << ON_SETBITS_SHIFT) #define LED_SIGNAL_ON_CLRBITS ((0) << ON_CLRBITS_SHIFT) #define LED_SIGNAL_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_SIGNAL_OFF_CLRBITS ((HYMINI_STM32_LED2) << OFF_CLRBITS_SHIFT) /* On: LED1+LED2 Off: - */ + #define LED_ASSERTION_ON_SETBITS ((HYMINI_STM32_LED2|HYMINI_STM32_LED2) << ON_SETBITS_SHIFT) #define LED_ASSERTION_ON_CLRBITS ((0) << ON_CLRBITS_SHIFT) #define LED_ASSERTION_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_ASSERTION_OFF_CLRBITS ((0) << OFF_CLRBITS_SHIFT) /* On: LED1 Off: LED2 */ + #define LED_PANIC_ON_SETBITS ((HYMINI_STM32_LED1) << ON_SETBITS_SHIFT) #define LED_PANIC_ON_CLRBITS ((HYMINI_STM32_LED2) << ON_CLRBITS_SHIFT) #define LED_PANIC_OFF_SETBITS ((HYMINI_STM32_LED2) << OFF_SETBITS_SHIFT) diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c index 8605c334fc..0164327070 100644 --- a/configs/kwikstik-k40/src/k40_leds.c +++ b/configs/kwikstik-k40/src/k40_leds.c @@ -43,24 +43,6 @@ #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledwarn llwarn -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledwarn(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c index 0bf1c51abd..05cfa40d1b 100644 --- a/configs/launchxl-tms57004/src/tms570_autoleds.c +++ b/configs/launchxl-tms57004/src/tms570_autoleds.c @@ -89,22 +89,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Name: board_autoled_initialize ****************************************************************************/ diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c index 9a99465a32..b1ce7eb8e0 100644 --- a/configs/lincoln60/src/lpc17_leds.c +++ b/configs/lincoln60/src/lpc17_leds.c @@ -60,25 +60,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lpc17_dumpgpio(LINCOLN60_LED2, m) #else # define led_dumpgpio(m) diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c index 5dc259383f..047a2e92d8 100644 --- a/configs/lm3s6432-s2e/src/lm_leds.c +++ b/configs/lm3s6432-s2e/src/lm_leds.c @@ -55,21 +55,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c index a26dd8cec9..4d1a92e8a5 100644 --- a/configs/lm3s6965-ek/src/lm_leds.c +++ b/configs/lm3s6965-ek/src/lm_leds.c @@ -55,17 +55,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -# define ledinfo llinfo +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else -# define lederr(x...) -# define ledinfo(x...) -# define ledinfo(x...) # define led_dumpgpio(m) #endif diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c index a6a938f2ac..3309dfc993 100644 --- a/configs/lm3s8962-ek/src/lm_leds.c +++ b/configs/lm3s8962-ek/src/lm_leds.c @@ -55,17 +55,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -# define ledinfo llinfo +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else -# define lederr(x...) -# define ledinfo(x...) -# define ledinfo(x...) # define led_dumpgpio(m) #endif diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c index 0d905af81a..a01f8fc970 100644 --- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c +++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c @@ -97,34 +97,14 @@ * LED_PANIC 4 ON OFF OFF (flashing 2Hz) */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c index 5c541622fe..37fbcddc0b 100644 --- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c @@ -54,9 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ /* LED definitions **********************************************************/ /* The LPC4330-Xplorer has 2 user-controllable LEDs labeled D2 an D3 in the * schematic and on but referred to has LED1 and LED2 here, respectively. @@ -89,30 +86,6 @@ * void board_userled_all(uint8_t ledset); */ -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c index 22db426237..cfa22479d9 100644 --- a/configs/lpc4330-xplorer/src/lpc43_userleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c @@ -66,30 +66,6 @@ * LEDs are pulled high to a low output illuminates the LED. */ -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c index 831a65ed2e..0a92d582aa 100644 --- a/configs/lpc4357-evb/src/lpc43_autoleds.c +++ b/configs/lpc4357-evb/src/lpc43_autoleds.c @@ -86,30 +86,6 @@ * -------------------------- -------- */ -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c index 7db57acecd..5a27a61e8f 100644 --- a/configs/lpc4357-evb/src/lpc43_userleds.c +++ b/configs/lpc4357-evb/src/lpc43_userleds.c @@ -77,30 +77,6 @@ * void board_userled_all(uint8_t ledset); */ -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c index 63050c2df6..b69407d7b5 100644 --- a/configs/lpc4370-link2/src/lpc43_autoleds.c +++ b/configs/lpc4370-link2/src/lpc43_autoleds.c @@ -54,34 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c index 0625b9077c..39d01a1b82 100644 --- a/configs/lpc4370-link2/src/lpc43_userleds.c +++ b/configs/lpc4370-link2/src/lpc43_userleds.c @@ -53,36 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ -/* LED definitions **********************************************************/ - - -/* Debug definitions ********************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define LED_VERBOSE 1 -# define ledinfo llerr -# else -# undef LED_VERBOSE -# define ledinfo(x...) -# endif -#else -# undef LED_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c index ff96ed7aed..2c032cd087 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c @@ -52,36 +52,12 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ static bool g_ncstate; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c index 011854e7c3..c0ed65821f 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c @@ -52,36 +52,12 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ static bool g_ncstate; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c index dd7bc6d305..0423027fd0 100644 --- a/configs/maple/src/stm32_leds.c +++ b/configs/maple/src/stm32_leds.c @@ -53,26 +53,6 @@ #include "stm32.h" #include "maple.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c index 9b318c34a7..f1f9978d40 100644 --- a/configs/mbed/src/lpc17_leds.c +++ b/configs/mbed/src/lpc17_leds.c @@ -60,25 +60,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lpc17_dumpgpio(MBED_LED3, m) #else # define led_dumpgpio(m) diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c index 9d42fb6c25..e1c89178ed 100644 --- a/configs/mirtoo/src/pic32_leds.c +++ b/configs/mirtoo/src/pic32_leds.c @@ -91,22 +91,6 @@ # define LED_NC 2 #endif -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c index c6f7712e33..14f5bec04c 100644 --- a/configs/moteino-mega/src/avr_leds.c +++ b/configs/moteino-mega/src/avr_leds.c @@ -53,36 +53,12 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ static bool g_ncoff; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c index 1c8705a0f7..cc30ec32a3 100644 --- a/configs/ne64badge/src/m9s12_leds.c +++ b/configs/ne64badge/src/m9s12_leds.c @@ -52,25 +52,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) m9s12_dumpgpio(m) #else # define led_dumpgpio(m) diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c index 1a4756301b..64c3cccb8c 100644 --- a/configs/nucleo-144/src/stm32_autoleds.c +++ b/configs/nucleo-144/src/stm32_autoleds.c @@ -54,18 +54,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - #define ArraySize(x) (sizeof((x)) / sizeof((x)[0])) /**************************************************************************** diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c index 15eb3039f0..a5dfaea3e7 100644 --- a/configs/nucleo-144/src/stm32_userleds.c +++ b/configs/nucleo-144/src/stm32_userleds.c @@ -56,18 +56,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - #define ArraySize(x) (sizeof((x)) / sizeof((x)[0])) /**************************************************************************** diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c index 5941f5eb9a..d7571a88e9 100644 --- a/configs/nucleo-f303re/src/stm32_autoleds.c +++ b/configs/nucleo-f303re/src/stm32_autoleds.c @@ -53,34 +53,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c index d1969ad0d6..a9fa8f1ff0 100644 --- a/configs/nucleo-f303re/src/stm32_userleds.c +++ b/configs/nucleo-f303re/src/stm32_userleds.c @@ -52,22 +52,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c index 242517858b..c37d1b016b 100644 --- a/configs/nucleo-f4x1re/src/stm32_autoleds.c +++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c @@ -54,30 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c index b75a12d63b..dd77500711 100644 --- a/configs/nucleo-f4x1re/src/stm32_userleds.c +++ b/configs/nucleo-f4x1re/src/stm32_userleds.c @@ -54,26 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c index 45d84d7778..eb1a1381c8 100644 --- a/configs/nucleo-l476rg/src/stm32_autoleds.c +++ b/configs/nucleo-l476rg/src/stm32_autoleds.c @@ -54,30 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c index a2ebbe3dd5..53d9193230 100644 --- a/configs/nucleo-l476rg/src/stm32_userleds.c +++ b/configs/nucleo-l476rg/src/stm32_userleds.c @@ -54,26 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c index 2d76cb7489..840858eaee 100644 --- a/configs/nutiny-nuc120/src/nuc_led.c +++ b/configs/nutiny-nuc120/src/nuc_led.c @@ -76,38 +76,14 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) nuc_dumpgpio(GPIO_LED, m) #else # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c index 613e4063dc..0603ba51b4 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_leds.c +++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c @@ -53,30 +53,6 @@ #include "lpc_h3131.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c index 207883a8ea..14914c0d94 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_leds.c +++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c @@ -58,25 +58,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LED1, m) #else # define led_dumpgpio(m) diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c index 884c89bfc3..6fefa2c9cd 100644 --- a/configs/olimex-stm32-h405/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c @@ -51,30 +51,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c index 83ab5ee2f3..aa00a80bdd 100644 --- a/configs/olimex-stm32-h405/src/stm32_userleds.c +++ b/configs/olimex-stm32-h405/src/stm32_userleds.c @@ -48,22 +48,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c index 5ec4fae864..b883e393df 100644 --- a/configs/olimex-stm32-h407/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c @@ -54,22 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c index 859548637e..ef430a3d86 100644 --- a/configs/olimex-stm32-h407/src/stm32_userleds.c +++ b/configs/olimex-stm32-h407/src/stm32_userleds.c @@ -53,22 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c index 04cca5a6c5..972eed5a89 100644 --- a/configs/olimex-stm32-p207/src/stm32_autoleds.c +++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c @@ -55,18 +55,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define LED_STARTED_BITS (BOARD_LED1_BIT) diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c index 8d5f76abf1..a3647a8148 100644 --- a/configs/olimex-stm32-p207/src/stm32_userleds.c +++ b/configs/olimex-stm32-p207/src/stm32_userleds.c @@ -48,22 +48,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c index e0b583b4a7..0440162844 100644 --- a/configs/olimexino-stm32/src/stm32_leds.c +++ b/configs/olimexino-stm32/src/stm32_leds.c @@ -54,25 +54,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) stm32_dumpgpio(GPIO_LED_GREEN, m) #else # define led_dumpgpio(m) diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c index 808ddef8df..e49b768677 100644 --- a/configs/open1788/src/lpc17_autoleds.c +++ b/configs/open1788/src/lpc17_autoleds.c @@ -134,25 +134,9 @@ #define LED_IDLE_OFF_SETBITS ((OPEN1788_LED4) << OFF_SETBITS_SHIFT) #define LED_IDLE_OFF_CLRBITS ((0) << OFF_CLRBITS_SHIFT) -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lpc17_dumpgpio(???, m) #else # define led_dumpgpio(m) diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c index 8f541c3713..f8e350dd12 100644 --- a/configs/open1788/src/lpc17_userleds.c +++ b/configs/open1788/src/lpc17_userleds.c @@ -60,25 +60,9 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_LEDS) +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) lpc17_dumpgpio(???, m) #else # define led_dumpgpio(m) diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c index eaa44f00fc..4e2bc33ccd 100644 --- a/configs/pcduino-a10/src/a1x_leds.c +++ b/configs/pcduino-a10/src/a1x_leds.c @@ -52,9 +52,6 @@ #include "pcduino_a10.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ /* The pcDuino v1 has four green LEDs; three can be controlled from software. * Two are tied to ground and, hence, illuminated by driving the output pins * to a high value: @@ -90,26 +87,6 @@ * application if CONFIG_ARCH_LEDS is not defined. */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c index 9177aa6613..671811631d 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_leds.c +++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c @@ -95,22 +95,6 @@ # define LED_NC 2 #endif -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c index 83c01668cd..d76fc7a4e5 100644 --- a/configs/pic32mx7mmb/src/pic32_leds.c +++ b/configs/pic32mx7mmb/src/pic32_leds.c @@ -98,22 +98,6 @@ # define LED_NC 2 #endif -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c index 31d14aa3cf..b94a0664e8 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c @@ -91,22 +91,6 @@ #define LED_ON 1 #define LED_NC 2 -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c index 169376a691..b2b5afe303 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c @@ -54,9 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ /* LED Configuration ********************************************************/ /* The PIC32MZ Ethernet Starter kit has 3 user LEDs labelled LED1-3 on the * board: @@ -71,22 +68,6 @@ * LEDs through the functions provided in this file */ -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c index 7800acfa9c..9a9b1cd9e5 100644 --- a/configs/sabre-6quad/src/imx_autoleds.c +++ b/configs/sabre-6quad/src/imx_autoleds.c @@ -78,22 +78,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c index e84145669d..343f680876 100644 --- a/configs/sam3u-ek/src/sam_leds.c +++ b/configs/sam3u-ek/src/sam_leds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - #define LED_OFF 0 #define LED_ON 1 #define LED_NOCHANGE 2 diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c index 35bcf7cff4..cb9f591078 100644 --- a/configs/sam4e-ek/src/sam_leds.c +++ b/configs/sam4e-ek/src/sam_leds.c @@ -98,18 +98,6 @@ #define D4_ON (LED_ON << D4_SHIFT) #define D4_NOCHANGE (LED_NOCHANGE << D4_SHIFT) -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c index 57b82a508a..5f86fda638 100644 --- a/configs/sam4l-xplained/src/sam_autoleds.c +++ b/configs/sam4l-xplained/src/sam_autoleds.c @@ -77,30 +77,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c index ad9d3a3000..ff14e0b210 100644 --- a/configs/sam4l-xplained/src/sam_userleds.c +++ b/configs/sam4l-xplained/src/sam_userleds.c @@ -62,22 +62,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c index 537892c59a..2855559f12 100644 --- a/configs/sam4s-xplained-pro/src/sam_autoleds.c +++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c @@ -53,9 +53,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on * board the SAM4S Xplained Pro. The following definitions describe how NuttX * controls the LEDs: @@ -74,26 +71,6 @@ * LED_IDLE MCU is is sleep mode Not used */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c index 4e41ddb13d..daf4692bea 100644 --- a/configs/sam4s-xplained-pro/src/sam_userleds.c +++ b/configs/sam4s-xplained-pro/src/sam_userleds.c @@ -52,22 +52,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c index b1763f91bb..d8b148c5d3 100644 --- a/configs/sam4s-xplained/src/sam_autoleds.c +++ b/configs/sam4s-xplained/src/sam_autoleds.c @@ -52,9 +52,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the two LEDs on * board the SAM4S Xplained. The following definitions describe how NuttX * controls the LEDs: @@ -73,26 +70,6 @@ * LED_IDLE MCU is is sleep mode Not used */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c index dbf687bdd4..550cbc191e 100644 --- a/configs/sam4s-xplained/src/sam_userleds.c +++ b/configs/sam4s-xplained/src/sam_userleds.c @@ -51,22 +51,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c index c565cf8d19..d49913e2f6 100644 --- a/configs/sama5d2-xult/src/sam_autoleds.c +++ b/configs/sama5d2-xult/src/sam_autoleds.c @@ -85,30 +85,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c index af44730d15..2361d14263 100644 --- a/configs/sama5d2-xult/src/sam_userleds.c +++ b/configs/sama5d2-xult/src/sam_userleds.c @@ -61,22 +61,6 @@ #include "sam_pio.h" #include "sama5d2-xult.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c index 046ab9a7f9..e435531d7c 100644 --- a/configs/sama5d3-xplained/src/sam_autoleds.c +++ b/configs/sama5d3-xplained/src/sam_autoleds.c @@ -87,30 +87,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c index 0a7ae94e57..bff302f364 100644 --- a/configs/sama5d3-xplained/src/sam_userleds.c +++ b/configs/sama5d3-xplained/src/sam_userleds.c @@ -63,22 +63,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c index 12ef20cd8d..ae4b1a32a3 100644 --- a/configs/sama5d3x-ek/src/sam_autoleds.c +++ b/configs/sama5d3x-ek/src/sam_autoleds.c @@ -87,30 +87,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c index 410305f53e..cd738625e3 100644 --- a/configs/sama5d3x-ek/src/sam_userleds.c +++ b/configs/sama5d3x-ek/src/sam_userleds.c @@ -63,22 +63,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c index 60b41878e6..62e930dfb8 100644 --- a/configs/sama5d4-ek/src/sam_autoleds.c +++ b/configs/sama5d4-ek/src/sam_autoleds.c @@ -92,30 +92,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c index 7837bbafb3..8e17e839bf 100644 --- a/configs/sama5d4-ek/src/sam_userleds.c +++ b/configs/sama5d4-ek/src/sam_userleds.c @@ -67,22 +67,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c index 0035691f77..6e6407753c 100644 --- a/configs/samd20-xplained/src/sam_autoleds.c +++ b/configs/samd20-xplained/src/sam_autoleds.c @@ -77,30 +77,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c index df71687374..cd98135cf5 100644 --- a/configs/samd20-xplained/src/sam_userleds.c +++ b/configs/samd20-xplained/src/sam_userleds.c @@ -62,30 +62,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c index 0613cc6568..b10ab464fe 100644 --- a/configs/samd21-xplained/src/sam_autoleds.c +++ b/configs/samd21-xplained/src/sam_autoleds.c @@ -77,30 +77,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c index 6bc4799016..1d54a19295 100644 --- a/configs/samd21-xplained/src/sam_userleds.c +++ b/configs/samd21-xplained/src/sam_userleds.c @@ -62,30 +62,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c index 36e0aa41fe..64fd6b663c 100644 --- a/configs/same70-xplained/src/sam_autoleds.c +++ b/configs/same70-xplained/src/sam_autoleds.c @@ -77,30 +77,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c index 8ddc16f9ab..53bff4eab0 100644 --- a/configs/saml21-xplained/src/sam_autoleds.c +++ b/configs/saml21-xplained/src/sam_autoleds.c @@ -77,30 +77,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c index 842bd26eba..94cf3550eb 100644 --- a/configs/saml21-xplained/src/sam_userleds.c +++ b/configs/saml21-xplained/src/sam_userleds.c @@ -62,30 +62,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c index f0cc48521e..a528c1db6e 100644 --- a/configs/samv71-xult/src/sam_autoleds.c +++ b/configs/samv71-xult/src/sam_autoleds.c @@ -93,30 +93,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c index e48e6c54f6..71f7b5e888 100644 --- a/configs/shenzhou/src/stm32_autoleds.c +++ b/configs/shenzhou/src/stm32_autoleds.c @@ -57,18 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define SHENZHOU_LED1 (1 << 0) diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c index 842cebd332..4beb5de5e8 100644 --- a/configs/shenzhou/src/stm32_userleds.c +++ b/configs/shenzhou/src/stm32_userleds.c @@ -53,22 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c index 8e3d002c77..8d72a6678c 100644 --- a/configs/spark/src/stm32_autoleds.c +++ b/configs/spark/src/stm32_autoleds.c @@ -59,18 +59,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to bit sets used to * manipulate the LEDs. All terms are in true logic, the led polarity is dealt * with in the phy_xxx operations diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c index d8e6608429..30cd9e1f41 100644 --- a/configs/spark/src/stm32_userleds.c +++ b/configs/spark/src/stm32_userleds.c @@ -54,22 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c index b54282ab3c..acdd62b1e5 100644 --- a/configs/stm3210e-eval/src/stm32_leds.c +++ b/configs/stm3210e-eval/src/stm32_leds.c @@ -57,18 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define STM3210E_LED1 (1 << 0) diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c index ee9e22af14..476816cac1 100644 --- a/configs/stm3220g-eval/src/stm32_autoleds.c +++ b/configs/stm3220g-eval/src/stm32_autoleds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define STM3210E_LED1 (1 << 0) diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c index 09299ae8ca..a94c8c360f 100644 --- a/configs/stm3220g-eval/src/stm32_userleds.c +++ b/configs/stm3220g-eval/src/stm32_userleds.c @@ -53,22 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c index d2c68f0280..71fc384d5c 100644 --- a/configs/stm3240g-eval/src/stm32_autoleds.c +++ b/configs/stm3240g-eval/src/stm32_autoleds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define STM3210E_LED1 (1 << 0) diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c index 14bed2ac69..18d380c99c 100644 --- a/configs/stm3240g-eval/src/stm32_userleds.c +++ b/configs/stm3240g-eval/src/stm32_userleds.c @@ -53,22 +53,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c index 1c136fdc09..36b9a913ad 100644 --- a/configs/stm32_tiny/src/stm32_leds.c +++ b/configs/stm32_tiny/src/stm32_leds.c @@ -52,26 +52,6 @@ #include "stm32.h" #include "stm32_tiny.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c index ca3215bba5..b851c44053 100644 --- a/configs/stm32f103-minimum/src/stm32_autoleds.c +++ b/configs/stm32f103-minimum/src/stm32_autoleds.c @@ -52,22 +52,6 @@ #include "stm32.h" #include "stm32f103_minimum.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c index f6046e4b21..313176f561 100644 --- a/configs/stm32f3discovery/src/stm32_autoleds.c +++ b/configs/stm32f3discovery/src/stm32_autoleds.c @@ -52,22 +52,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c index adacc7cdaf..b68e261d12 100644 --- a/configs/stm32f3discovery/src/stm32_userleds.c +++ b/configs/stm32f3discovery/src/stm32_userleds.c @@ -51,22 +51,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c index b362bbb4b2..afe6f244db 100644 --- a/configs/stm32f429i-disco/src/stm32_autoleds.c +++ b/configs/stm32f429i-disco/src/stm32_autoleds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define STM32F4_LED1 (1 << 0) diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c index 4cae147baa..6bb638889d 100644 --- a/configs/stm32f429i-disco/src/stm32_userleds.c +++ b/configs/stm32f429i-disco/src/stm32_userleds.c @@ -54,22 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c index ca588bdf40..b7ebe06d6f 100644 --- a/configs/stm32f4discovery/src/stm32_autoleds.c +++ b/configs/stm32f4discovery/src/stm32_autoleds.c @@ -58,18 +58,6 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /* The following definitions map the encoded LED setting to GPIO settings */ #define STM32F4_LED1 (1 << 0) diff --git a/configs/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c index 39bec28aad..66dc4fd0f1 100644 --- a/configs/stm32f4discovery/src/stm32_rgbled.c +++ b/configs/stm32f4discovery/src/stm32_rgbled.c @@ -86,16 +86,6 @@ # undef HAVE_RGBLED #endif -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledwarn llwarn -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledwarn(x...) -# define ledinfo(x...) -#endif - #ifdef HAVE_RGBLED /************************************************************************************ diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c index 7bc9d1d6b4..392b14f73e 100644 --- a/configs/stm32f4discovery/src/stm32_userleds.c +++ b/configs/stm32f4discovery/src/stm32_userleds.c @@ -55,22 +55,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c index 8f9b4c956b..3875d4a54f 100644 --- a/configs/stm32f746g-disco/src/stm32_autoleds.c +++ b/configs/stm32f746g-disco/src/stm32_autoleds.c @@ -49,22 +49,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c index 3115c95d3a..4541668075 100644 --- a/configs/stm32f746g-disco/src/stm32_userleds.c +++ b/configs/stm32f746g-disco/src/stm32_userleds.c @@ -47,22 +47,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c index bb9201149b..e21faf7249 100644 --- a/configs/stm32l476vg-disco/src/stm32_autoleds.c +++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c @@ -54,22 +54,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c index d284a836c8..4bee92bde8 100644 --- a/configs/stm32l476vg-disco/src/stm32_userleds.c +++ b/configs/stm32l476vg-disco/src/stm32_userleds.c @@ -54,22 +54,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c index 59f6920c26..5f4ea2e031 100644 --- a/configs/stm32ldiscovery/src/stm32_autoleds.c +++ b/configs/stm32ldiscovery/src/stm32_autoleds.c @@ -73,26 +73,6 @@ * LED_IDLE STM32 is is sleep mode Not used */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c index 57cf3c0dd0..a90ff178e9 100644 --- a/configs/stm32ldiscovery/src/stm32_userleds.c +++ b/configs/stm32ldiscovery/src/stm32_userleds.c @@ -51,22 +51,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c index 17ff81449a..1174511a60 100644 --- a/configs/stm32vldiscovery/src/stm32_leds.c +++ b/configs/stm32vldiscovery/src/stm32_leds.c @@ -54,22 +54,6 @@ #include "stm32.h" #include "stm32vldiscovery.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c index 4f814b371a..18e587267c 100644 --- a/configs/sure-pic32mx/src/pic32mx_autoleds.c +++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c @@ -86,22 +86,6 @@ #define LED_ON 1 #define LED_NC 2 -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c index ebe96f65bf..b81afc6f5d 100644 --- a/configs/teensy-2.0/src/at90usb_leds.c +++ b/configs/teensy-2.0/src/at90usb_leds.c @@ -53,22 +53,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledwarn llwarn -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledwarn(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c index ac72ed4eb3..e4e4cac621 100644 --- a/configs/teensy-lc/src/kl_led.c +++ b/configs/teensy-lc/src/kl_led.c @@ -52,34 +52,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c index a7b4a76242..c07c1b9dc8 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c +++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c @@ -97,23 +97,9 @@ * LED_PANIC 4 ON OFF OFF (flashing 2Hz) */ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledwarn llwarn -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledwarn(x...) -# define ledinfo(x...) -#endif - /* Dump GPIO registers */ -#ifdef CONFIG_DEBUG_LEDS +#ifdef CONFIG_DEBUG_LEDS_INFO # define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define led_dumpgpio(m) diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c index 89b70ee516..c3a285b29c 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c +++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c @@ -63,22 +63,6 @@ #ifndef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c index 55e3b19b84..c11e04cb2e 100644 --- a/configs/twr-k60n512/src/k60_leds.c +++ b/configs/twr-k60n512/src/k60_leds.c @@ -119,18 +119,6 @@ #define LED_PANIC_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_PANIC_OFF_CLRBITS ((K60_LED4) << OFF_CLRBITS_SHIFT) -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c index cf6d8655bf..d29fe996dd 100644 --- a/configs/u-blox-c027/src/lpc17_leds.c +++ b/configs/u-blox-c027/src/lpc17_leds.c @@ -52,26 +52,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c index a26fa1ceb2..cc7dd9a0ee 100644 --- a/configs/ubw32/src/pic32_leds.c +++ b/configs/ubw32/src/pic32_leds.c @@ -95,22 +95,6 @@ # define LED_NC 2 #endif -/* Debug ********************************************************************/ - -#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef CONFIG_DEBUG_LEDS -# undef CONFIG_DEBUG_INFO -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private types ****************************************************************************/ diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c index 42db57f553..4653c4a341 100644 --- a/configs/viewtool-stm32f107/src/stm32_leds.c +++ b/configs/viewtool-stm32f107/src/stm32_leds.c @@ -49,26 +49,6 @@ #include "stm32_gpio.h" #include "viewtool_stm32f107.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# define ledinfo llinfo -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c index b04405f34c..95602fa36e 100644 --- a/configs/zkit-arm-1769/src/lpc17_lcd.c +++ b/configs/zkit-arm-1769/src/lpc17_lcd.c @@ -64,30 +64,6 @@ #ifdef CONFIG_NX_LCDDRIVER -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with - * CONFIG_DEBUG_INFO too) - */ - -#undef LCD_DEBUG /* Define to enable debug */ -#undef LCD_VERBOSE /* Define to enable verbose debug */ - -#ifdef LCD_DEBUG -# define lederr llerr -# ifdef LCD_VERBOSE -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# undef LCD_VERBOSE -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ @@ -114,7 +90,7 @@ int board_lcd_initialize(void) g_spidev = lpc17_sspbus_initialize(0); if (!g_spidev) { - gllerr("ERROR: Failed to initialize SSP port 0\n"); + lcdllerr("ERROR: Failed to initialize SSP port 0\n"); return 0; } @@ -133,13 +109,14 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) g_lcddev = st7567_initialize(g_spidev, lcddev); if (!g_lcddev) { - gllerr("ERROR: Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); + lcdllerr("ERROR: Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); } else { - gllinfo("Bound SSI port 0 to OLCD %d\n", lcddev); + lcdllinfo("Bound SSI port 0 to OLCD %d\n", lcddev); /* And turn the OLCD on (CONFIG_LCD_MAXPOWER should be 1) */ + (void)g_lcddev->setpower(g_lcddev, CONFIG_LCD_MAXPOWER); return g_lcddev; } diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c index 52683c7777..59c9fd6d83 100644 --- a/configs/zkit-arm-1769/src/lpc17_leds.c +++ b/configs/zkit-arm-1769/src/lpc17_leds.c @@ -58,26 +58,6 @@ #ifdef CONFIG_ARCH_LEDS -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * and pherhaps CONFIG_DEBUG_INFO too) - */ - -#ifdef CONFIG_DEBUG_LEDS -# define lederr llerr -# ifdef CONFIG_DEBUG_INFO -# define ledinfo llerr -# else -# define ledinfo(x...) -# endif -#else -# define lederr(x...) -# define ledinfo(x...) -#endif - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/drivers/leds/ncp5623c.c b/drivers/leds/ncp5623c.c index 77c1a77dda..c1dfb216e5 100644 --- a/drivers/leds/ncp5623c.c +++ b/drivers/leds/ncp5623c.c @@ -48,20 +48,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_NCP5623C) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifdef CONFIG_DEBUG_LEDS -# define derr llerr -# define dwarn llwarn -# define dinfo llinfo -#else -# define derr(x...) -# define dwarn(x...) -# define dinfo(x...) -#endif - /**************************************************************************** * Private Type Definitions ****************************************************************************/ @@ -136,14 +122,14 @@ static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv, /* Write the data (no RESTART) */ - dinfo("i2c addr: 0x%02X value: 0x%02X\n", priv->i2c_addr, + lcdinfo("i2c addr: 0x%02X value: 0x%02X\n", priv->i2c_addr, buffer[0]); ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE); if (ret != OK) { - derr("ERROR: i2c_write returned error code %d\n", ret); + lcderr("ERROR: i2c_write returned error code %d\n", ret); return ret; } @@ -170,7 +156,7 @@ static int ncp5623c_open(FAR struct file *filep) ret = ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN, 0x00); if (ret != OK) { - derr("ERROR: Could not shut down the NCP5623C\n"); + lcderr("ERROR: Could not shut down the NCP5623C\n"); return ret; } @@ -179,7 +165,7 @@ static int ncp5623c_open(FAR struct file *filep) ret = ncp5623c_i2c_write_byte(priv, NCP5623C_ILED, 0x1F); if (ret != OK) { - derr("ERROR: Could not set up max current\n"); + lcderr("ERROR: Could not set up max current\n"); return ret; } @@ -228,7 +214,7 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct ncp5623c_dev_s *priv = inode->i_private; int ret = OK; - dinfo("cmd: %d arg: %ld\n", cmd, arg); + lcdinfo("cmd: %d arg: %ld\n", cmd, arg); switch (cmd) { @@ -242,7 +228,7 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg) DEBUGASSERT(ptr != NULL); if (ptr->reg > NCP5623C_MAX_REG) { - derr("ERROR: Unrecognized register: %d\n", ptr->reg); + lcderr("ERROR: Unrecognized register: %d\n", ptr->reg); ret = -EFAULT; break; } @@ -255,7 +241,7 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - derr("ERROR: Unrecognized cmd: %d\n", cmd); + lcderr("ERROR: Unrecognized cmd: %d\n", cmd); ret = -ENOTTY; } break; @@ -300,7 +286,7 @@ int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, if (priv == NULL) { - derr("ERROR: Failed to allocate instance of ncp5623c_dev_s\n"); + lcderr("ERROR: Failed to allocate instance of ncp5623c_dev_s\n"); return -ENOMEM; } @@ -312,7 +298,7 @@ int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, int const ret = register_driver(devpath, &g_ncp5623c_fileops, 666, priv); if (ret != OK) { - derr("ERROR: Failed to register driver: %d\n", ret); + lcderr("ERROR: Failed to register driver: %d\n", ret); kmm_free(priv); return ret; } @@ -356,7 +342,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer, unsigned int blue; char color[3]; - dinfo("%s\n", buffer); + lcdinfo("%s\n", buffer); /* We need to receive a string #RRGGBB = 7 bytes */ @@ -421,7 +407,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer, red); if (ret != OK) { - derr("ERROR: Could not set red led\n"); + lcderr("ERROR: Could not set red led\n"); return ret; } @@ -431,7 +417,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer, green); if (ret != OK) { - derr("ERROR: Could not set green led\n"); + lcderr("ERROR: Could not set green led\n"); return ret; } @@ -441,7 +427,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer, blue); if (ret != OK) { - derr("ERROR: Could not set blue led\n"); + lcderr("ERROR: Could not set blue led\n"); return ret; } diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c index b0820e17f3..87f18bd288 100644 --- a/drivers/leds/pca9635pw.c +++ b/drivers/leds/pca9635pw.c @@ -48,20 +48,6 @@ #if defined(CONFIG_I2C) && defined(CONFIG_PCA9635PW) -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifdef CONFIG_DEBUG_LEDS -# define derr llerr -# define dwarn llwarn -# define dinfo llinfo -#else -# define derr(x...) -# define dwarn(x...) -# define dinfo(x...) -#endif - /**************************************************************************** * Private Type Definitions ****************************************************************************/ @@ -135,13 +121,13 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv, /* Write the register address followed by the data (no RESTART) */ - dinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr, + lcdllinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr, buffer[0], buffer[1]); ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE); if (ret != OK) { - derr("ERROR: i2c_write returned error code %d\n", ret); + lcderr("ERROR: i2c_write returned error code %d\n", ret); return ret; } @@ -200,7 +186,7 @@ static int pca9635pw_open(FAR struct file *filep) PCA9635PW_MODE_1_INITIAL_VALUE); if (ret != OK) { - derr("ERROR: Could not set initial config for PCA9635PW_MODE_1\n"); + lcderr("ERROR: Could not set initial config for PCA9635PW_MODE_1\n"); return ret; } @@ -217,7 +203,7 @@ static int pca9635pw_open(FAR struct file *filep) PCA9635PW_MODE_2_INITIAL_VALUE); if (ret != OK) { - derr("ERROR: Could not set initial config for PCA9635PW_MODE_2\n"); + lcderr("ERROR: Could not set initial config for PCA9635PW_MODE_2\n"); return ret; } @@ -235,8 +221,8 @@ static int pca9635pw_open(FAR struct file *filep) ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_2); if (ret != OK) { - derr("ERROR: Could not set led driver outputs to MODE2 (LED's brightness are " - "controlled by pwm registers)\n"); + lcderr("ERROR: Could not set led driver outputs to MODE2 (LED's brightness are " + "controlled by pwm registers)\n"); return ret; } @@ -262,7 +248,7 @@ static int pca9635pw_close(FAR struct file *filep) ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_0); if (ret != OK) { - derr("ERROR: Could not set led driver outputs to MODE0 (LED's are off)\n"); + lcderr("ERROR: Could not set led driver outputs to MODE0 (LED's are off)\n"); return ret; } @@ -294,7 +280,7 @@ static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct pca9635pw_dev_s *priv = inode->i_private; int ret = OK; - dinfo("cmd: %d arg: %ld\n", cmd, arg); + lcdllinfo("cmd: %d arg: %ld\n", cmd, arg); switch (cmd) { @@ -321,7 +307,7 @@ static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - derr("ERROR: Unrecognized cmd: %d\n", cmd); + lcderr("ERROR: Unrecognized cmd: %d\n", cmd); ret = -ENOTTY; } break; @@ -366,7 +352,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, if (priv == NULL) { - derr("ERROR: Failed to allocate instance of pca9635pw_dev_s\n"); + lcderr("ERROR: Failed to allocate instance of pca9635pw_dev_s\n"); return -ENOMEM; } @@ -378,7 +364,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, int const ret = register_driver(devpath, &g_pca9635pw_fileops, 666, priv); if (ret != OK) { - derr("ERROR: Failed to register driver: %d\n", ret); + lcderr("ERROR: Failed to register driver: %d\n", ret); kmm_free(priv); return ret; } diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c index 503ffea722..88eb2f6223 100644 --- a/drivers/leds/rgbled.c +++ b/drivers/leds/rgbled.c @@ -62,24 +62,6 @@ #ifdef CONFIG_RGBLED -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ -/* Debug ********************************************************************/ -/* Non-standard debug that may be enabled just for testing PWM */ - -#ifdef CONFIG_DEBUG_LEDS -# define derr err -# define dinfo info -# define dllerr llerr -# define dllinfo llinfo -#else -# define derr(x...) -# define dinfo(x...) -# define dllerr(x...) -# define dllinfo(x...) -#endif - /**************************************************************************** * Private Type Definitions ****************************************************************************/ @@ -146,7 +128,7 @@ static int rgbled_open(FAR struct file *filep) uint8_t tmp; int ret; - dinfo("crefs: %d\n", upper->crefs); + lcdinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -197,7 +179,7 @@ static int rgbled_close(FAR struct file *filep) FAR struct rgbled_upperhalf_s *upper = inode->i_private; int ret; - dinfo("crefs: %d\n", upper->crefs); + lcdinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -391,7 +373,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr, if (!upper) { - derr("ERROR: Allocation failed\n"); + lcderr("ERROR: Allocation failed\n"); return -ENOMEM; } @@ -406,7 +388,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr, /* Register the PWM device */ - dinfo("Registering %s\n", path); + lcdinfo("Registering %s\n", path); return register_driver(path, &g_rgbledops, 0666, upper); } diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c index e24eafef2c..964665d187 100644 --- a/drivers/leds/userled_upper.c +++ b/drivers/leds/userled_upper.c @@ -57,27 +57,6 @@ #include #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_LEDS -#endif - -#ifdef CONFIG_DEBUG_LEDS -# define derr llerr -# ifdef CONFIG_DEBUG_INFO -# define dinfo llinfo -# else -# define dinfo(x...) -# endif -#else -# define derr(x...) -# define dinfo(x...) -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -197,7 +176,7 @@ static int userled_open(FAR struct file *filep) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dinfo("ERROR: userled_takesem failed: %d\n", ret); + lcdinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -206,7 +185,7 @@ static int userled_open(FAR struct file *filep) opriv = (FAR struct userled_open_s *)kmm_zalloc(sizeof(struct userled_open_s)); if (!opriv) { - dinfo("ERROR: Failled to allocate open structure\n"); + lcdinfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -274,7 +253,7 @@ static int userled_close(FAR struct file *filep) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dinfo("ERROR: userled_takesem failed: %d\n", ret); + lcdinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -287,7 +266,7 @@ static int userled_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - dinfo("ERROR: Failed to find open entry\n"); + lcdinfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -339,7 +318,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer, if (len < sizeof(userled_set_t)) { - dinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); + lcdinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); return -EINVAL; } @@ -356,7 +335,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer, ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dinfo("ERROR: userled_takesem failed: %d\n", ret); + lcdinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -391,7 +370,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dinfo("ERROR: userled_takesem failed: %d\n", ret); + lcdinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -521,7 +500,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - dinfo("ERROR: Unrecognized command: %ld\n", cmd); + lcdinfo("ERROR: Unrecognized command: %ld\n", cmd); ret = -ENOTTY; break; } @@ -569,7 +548,7 @@ int userled_register(FAR const char *devname, if (!priv) { - dinfo("ERROR: Failed to allocate device structure\n"); + lcdinfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -590,7 +569,7 @@ int userled_register(FAR const char *devname, ret = register_driver(devname, &userled_fops, 0666, priv); if (ret < 0) { - dinfo("ERROR: register_driver failed: %d\n", ret); + lcdinfo("ERROR: register_driver failed: %d\n", ret); goto errout_with_priv; } diff --git a/include/debug.h b/include/debug.h index 84700d2ca3..9abe4073ac 100644 --- a/include/debug.h +++ b/include/debug.h @@ -573,6 +573,30 @@ # define lcdllinfo(x...) #endif +#ifdef CONFIG_DEBUG_LEDS_ERROR +# define lederr(format, ...) err(format, ##__VA_ARGS__) +# define ledllerr(format, ...) llerr(format, ##__VA_ARGS__) +#else +# define lederr(x...) +# define ledllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_LEDS_WARN +# define ledwarn(format, ...) warn(format, ##__VA_ARGS__) +# define ledllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else +# define ledwarn(x...) +# define ledllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_LEDS_INFO +# define ledinfo(format, ...) info(format, ##__VA_ARGS__) +# define ledllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else +# define ledinfo(x...) +# define ledllinfo(x...) +#endif + #ifdef CONFIG_DEBUG_GPIO_ERROR # define gpioerr(format, ...) err(format, ##__VA_ARGS__) # define gpiollerr(format, ...) llerr(format, ##__VA_ARGS__) @@ -1066,6 +1090,30 @@ # define lcdllinfo (void) #endif +#ifdef CONFIG_DEBUG_LEDS_ERROR +# define lederr err +# define ledllerr llerr +#else +# define lederr (void) +# define ledllerr (void) +#endif + +#ifdef CONFIG_DEBUG_LEDS_WARN +# define ledwarn warn +# define ledllwarn llwarn +#else +# define ledwarn (void) +# define ledllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_LEDS_INFO +# define ledinfo info +# define ledllinfo llinfo +#else +# define ledinfo (void) +# define ledllinfo (void) +#endif + #ifdef CONFIG_DEBUG_GPIO_ERROR # define gpioerr err # define gpiollerr llerr @@ -1268,6 +1316,14 @@ # define lcdinfodumpbuffer(m,b,n) #endif +#ifdef CONFIG_DEBUG_LEDS +# define lederrdumpbuffer(m,b,n) errdumpbuffer(m,b,n) +# define ledinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) +#else +# define lederrdumpbuffer(m,b,n) +# define ledinfodumpbuffer(m,b,n) +#endif + #ifdef CONFIG_DEBUG_GPIO # define gpioerrdumpbuffer(m,b,n) errdumpbuffer(m,b,n) # define gpioinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)