diff --git a/configs/arduino-due/include/board.h b/configs/arduino-due/include/board.h index f486b7ab21..8f3bd90e9c 100644 --- a/configs/arduino-due/include/board.h +++ b/configs/arduino-due/include/board.h @@ -158,14 +158,14 @@ * GPIO output to low. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_L 0 #define BOARD_LED_RX 1 #define BOARD_LED_TX 2 #define BOARD_NLEDS 3 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_L_BIT (1 << BOARD_LED_L) #define BOARD_LED_RX_BIT (1 << BOARD_LED_RX) @@ -253,22 +253,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/cc3200-launchpad/include/board.h b/configs/cc3200-launchpad/include/board.h index 7dd4eb2d07..b55819d0b2 100644 --- a/configs/cc3200-launchpad/include/board.h +++ b/configs/cc3200-launchpad/include/board.h @@ -113,14 +113,14 @@ * BOARD_LED_Y -- Connected to PF2 */ -/* LED index values for use with cc3200_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_R 1 #define BOARD_LED_G 2 #define BOARD_LED_Y 3 #define BOARD_NLEDS 3 -/* LED bits for use with cc3200_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -192,23 +192,6 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: cc3200_ledinit, cc3200_setled, and cc3200_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -void cc3200_ledinit(void); - -#ifndef CONFIG_ARCH_LEDS -void cc3200_setled(int led, unsigned char ledon); -void cc3200_setleds(unsigned char ledset); -#endif - /************************************************************************************ * Name: up_buttoninit * diff --git a/configs/cloudctrl/include/board.h b/configs/cloudctrl/include/board.h index 00c453fe4c..474caee909 100644 --- a/configs/cloudctrl/include/board.h +++ b/configs/cloudctrl/include/board.h @@ -125,7 +125,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -133,7 +133,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -322,22 +322,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: stm32_lcdclear * diff --git a/configs/dk-tm4c129x/include/board.h b/configs/dk-tm4c129x/include/board.h index 2e9c4549ad..75a0f7a4cf 100644 --- a/configs/dk-tm4c129x/include/board.h +++ b/configs/dk-tm4c129x/include/board.h @@ -126,14 +126,14 @@ * --- ------------ ----------------- */ -/* LED index values for use with tiva_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_R 0 #define BOARD_LED_G 1 #define BOARD_LED_B 2 #define BOARD_NLEDS 3 -/* LED bits for use with tiva_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_R_BIT (1 << BOARD_LED_R) #define BOARD_LED_G_BIT (1 << BOARD_LED_G) @@ -261,22 +261,6 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ledinit, tiva_setled, and tiva_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void tiva_ledinit(void); -void tiva_setled(int led, bool ledon); -void tiva_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: tiva_tmp100_initialize * diff --git a/configs/efm32-g8xx-stk/include/board.h b/configs/efm32-g8xx-stk/include/board.h index e725301650..55b0072024 100644 --- a/configs/efm32-g8xx-stk/include/board.h +++ b/configs/efm32-g8xx-stk/include/board.h @@ -170,7 +170,7 @@ * any way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with efm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED0 0 #define BOARD_LED1 1 @@ -178,7 +178,7 @@ #define BOARD_LED3 3 #define BOARD_NLEDS 4 -/* LED bits for use with efm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED0_BIT (1 << BOARD_LED0) #define BOARD_LED1_BIT (1 << BOARD_LED1) @@ -224,20 +224,4 @@ * Public Function Prototypes ****************************************************************************/ -/**************************************************************************** - * Name: efm32_ledinit, efm32_setled, and efm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void efm32_ledinit(void); -void efm32_setled(int led, bool ledon); -void efm32_setleds(uint8_t ledset); -#endif - #endif /* __CONFIGS_EFM32_G8XX_STK_INCLUDE_BOARD_H */ diff --git a/configs/efm32gg-stk3700/include/board.h b/configs/efm32gg-stk3700/include/board.h index 61c846461c..f8816cc9a7 100644 --- a/configs/efm32gg-stk3700/include/board.h +++ b/configs/efm32gg-stk3700/include/board.h @@ -186,13 +186,13 @@ * value to the LED. */ -/* LED index values for use with efm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED0 0 #define BOARD_LED1 1 #define BOARD_NLEDS 2 -/* LED bits for use with efm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED0_BIT (1 << BOARD_LED0) #define BOARD_LED1_BIT (1 << BOARD_LED1) @@ -269,20 +269,4 @@ * Public Function Prototypes ****************************************************************************/ -/**************************************************************************** - * Name: efm32_ledinit, efm32_setled, and efm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void efm32_ledinit(void); -void efm32_setled(int led, bool ledon); -void efm32_setleds(uint8_t ledset); -#endif - #endif /* __CONFIGS_EFM32GG_STK3700_INCLUDE_BOARD_H */ diff --git a/configs/fire-stm32v2/include/board.h b/configs/fire-stm32v2/include/board.h index 8ff984a0fe..880ea6d6c7 100644 --- a/configs/fire-stm32v2/include/board.h +++ b/configs/fire-stm32v2/include/board.h @@ -385,22 +385,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: fire_lcdclear * diff --git a/configs/lm4f120-launchpad/include/board.h b/configs/lm4f120-launchpad/include/board.h index 92317abdde..0009ba764b 100644 --- a/configs/lm4f120-launchpad/include/board.h +++ b/configs/lm4f120-launchpad/include/board.h @@ -117,14 +117,14 @@ * BOARD_LED_B -- Connected to PF2 */ -/* LED index values for use with lm4f_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_R 0 #define BOARD_LED_G 1 #define BOARD_LED_B 2 #define BOARD_NLEDS 3 -/* LED bits for use with lm4f_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -202,21 +202,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: lm4f_ledinit, lm4f_setled, and lm4f_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void lm4f_ledinit(void); -void lm4f_setled(int led, bool ledon); -void lm4f_setleds(uint8_t ledset); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/configs/lpc4330-xplorer/include/board.h b/configs/lpc4330-xplorer/include/board.h index 82f14ccecf..1d3928936d 100644 --- a/configs/lpc4330-xplorer/include/board.h +++ b/configs/lpc4330-xplorer/include/board.h @@ -214,14 +214,14 @@ * * LEDs are pulled high to a low output illuminates the LED. * - * LED index values for use with lpc43_setled() + * LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 #define BOARD_NLEDS 2 -/* LED bits for use with lpc43_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -232,9 +232,9 @@ * control of the application. The following interfaces are then available * for application control of the LEDs: * - * void lpc43_ledinit(void); - * void lpc43_setled(int led, bool ledon); - * void lpc43_setleds(uint8_t ledset); + * void board_userled_initialize(void); + * void board_userled(int led, bool ledon); + * void board_userled_all(uint8_t ledset); */ /* ON OFF */ /* LED1 LED2 LED1 LED2 */ @@ -294,7 +294,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -313,23 +314,7 @@ extern "C" { * ****************************************************************************/ -EXTERN void lpc43_boardinitialize(void); - -/**************************************************************************** - * Name: lpc43_ledinit, lpc43_setled, and lpc43_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void lpc43_ledinit(void); -EXTERN void lpc43_setled(int led, bool ledon); -EXTERN void lpc43_setleds(uint8_t ledset); -#endif +void lpc43_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/lpc4357-evb/include/board.h b/configs/lpc4357-evb/include/board.h index 5f418a876c..a1667e66da 100644 --- a/configs/lpc4357-evb/include/board.h +++ b/configs/lpc4357-evb/include/board.h @@ -216,13 +216,13 @@ * * A low output illuminates the LED. * - * LED index values for use with lpc43_setled() + * LED index values for use with board_userled() */ #define BOARD_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with lpc43_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED _BIT (1 << BOARD_LED) @@ -243,9 +243,9 @@ * control of the application. The following interfaces are then available * for application control of the LEDs: * - * void lpc43_ledinit(void); - * void lpc43_setled(int led, bool ledon); - * void lpc43_setleds(uint8_t ledset); + * void board_userled_initialize(void); + * void board_userled(int led, bool ledon); + * void board_userled_all(uint8_t ledset); */ /* Button definitions *******************************************************/ @@ -299,7 +299,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -318,23 +319,7 @@ extern "C" { * ****************************************************************************/ -EXTERN void lpc43_boardinitialize(void); - -/**************************************************************************** - * Name: lpc43_ledinit, lpc43_setled, and lpc43_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void lpc43_ledinit(void); -EXTERN void lpc43_setled(int led, bool ledon); -EXTERN void lpc43_setleds(uint8_t ledset); -#endif +void lpc43_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/lpc4370-link2/include/board.h b/configs/lpc4370-link2/include/board.h index 0ba0d3f84e..b094ad7ec3 100644 --- a/configs/lpc4370-link2/include/board.h +++ b/configs/lpc4370-link2/include/board.h @@ -207,13 +207,13 @@ /* * LED1 K2 GPIO0[8] * - * LED index values for use with lpc43_setled() + * LED index values for use with board_userled() */ #define BOARD_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with lpc43_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_BIT (1 << BOARD_LED) @@ -223,9 +223,9 @@ * control of the application. The following interfaces are then available * for application control of the LEDs: * - * void lpc43_ledinit(void); - * void lpc43_setled(int led, bool ledon); - * void lpc43_setleds(uint8_t ledset); + * void board_userled_initialize(void); + * void board_userled(int led, bool ledon); + * void board_userled_all(uint8_t ledset); */ /* LED */ #define LED_STARTED 0 /* OFF */ @@ -283,7 +283,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -302,23 +303,7 @@ extern "C" { * ****************************************************************************/ -EXTERN void lpc43_boardinitialize(void); - -/**************************************************************************** - * Name: lpc43_ledinit, lpc43_setled, and lpc43_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void lpc43_ledinit(void); -EXTERN void lpc43_setled(int led, bool ledon); -EXTERN void lpc43_setleds(uint8_t ledset); -#endif +void lpc43_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/mikroe-stm32f4/include/board.h b/configs/mikroe-stm32f4/include/board.h index 28d1ec59f2..796b6a62b4 100644 --- a/configs/mikroe-stm32f4/include/board.h +++ b/configs/mikroe-stm32f4/include/board.h @@ -162,7 +162,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #if 0 #define BOARD_LED1 0 @@ -178,7 +178,7 @@ #define BOARD_LED_RED BOARD_LED3 #define BOARD_LED_BLUE BOARD_LED4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -281,22 +281,6 @@ extern "C" void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/mirtoo/include/board.h b/configs/mirtoo/include/board.h index 39c0ca4843..077f12f44f 100644 --- a/configs/mirtoo/include/board.h +++ b/configs/mirtoo/include/board.h @@ -106,13 +106,13 @@ * controllable from software. */ - /* LED index values for use with pic32mx_setled() */ + /* LED index values for use with board_userled() */ #define PIC32MX_MIRTOO_LED0 0 #define PIC32MX_MIRTOO_LED1 1 #define PIC32MX_MIRTOO_NLEDS 2 -/* LED bits for use with pic32mx_setleds() */ +/* LED bits for use with board_userled_all() */ #define PIC32MX_MIRTOO_LED0_BIT (1 << PIC32MX_MIRTOO_LED0) #define PIC32MX_MIRTOO_LED1_BIT (1 << PIC32MX_MIRTOO_LED1) @@ -154,33 +154,18 @@ * Inline Functions ****************************************************************************/ -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Name: pic32mx_ledinit, pic32mx_setled, and pic32mx_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applicaitons. - * + * Public Function Prototypes ****************************************************************************/ -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_ledinit(void); -EXTERN void pic32mx_setled(int led, bool ledon); -EXTERN void pic32mx_setleds(uint8_t ledset); -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/configs/moxa/include/board.h b/configs/moxa/include/board.h index 956003b4a6..4e842198cd 100644 --- a/configs/moxa/include/board.h +++ b/configs/moxa/include/board.h @@ -155,14 +155,14 @@ * GPIO output to low. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_L 0 #define BOARD_LED_RX 1 #define BOARD_LED_TX 2 #define BOARD_NLEDS 3 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_L_BIT (1 << BOARD_LED_L) #define BOARD_LED_RX_BIT (1 << BOARD_LED_RX) diff --git a/configs/nucleo-f303re/include/board.h b/configs/nucleo-f303re/include/board.h index 21893e43ba..f1abd53a8a 100644 --- a/configs/nucleo-f303re/include/board.h +++ b/configs/nucleo-f303re/include/board.h @@ -175,12 +175,12 @@ * any way. The following definition is used to access the LED. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 /* User LD2 */ #define BOARD_NLEDS 1 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) @@ -284,22 +284,6 @@ extern "C" void stm32_boardinitialize(void); -/**************************************************************************** - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #ifdef __cplusplus } #endif diff --git a/configs/nucleo-f4x1re/include/board.h b/configs/nucleo-f4x1re/include/board.h index 145f0377f9..cd6db041bd 100644 --- a/configs/nucleo-f4x1re/include/board.h +++ b/configs/nucleo-f4x1re/include/board.h @@ -165,12 +165,12 @@ * - When the I/O is LOW, the LED is off. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LD2 0 #define BOARD_NLEDS 1 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LD2_BIT (1 << BOARD_LD2) @@ -246,22 +246,6 @@ extern "C" void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/olimex-efm32g880f128-stk/include/board.h b/configs/olimex-efm32g880f128-stk/include/board.h index 1a0e3a49bf..f9c0a2c4ce 100644 --- a/configs/olimex-efm32g880f128-stk/include/board.h +++ b/configs/olimex-efm32g880f128-stk/include/board.h @@ -170,7 +170,7 @@ * any way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with efm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -183,7 +183,7 @@ #define BOARD_LED_RED BOARD_LED3 #define BOARD_LED_BLUE BOARD_LED4 -/* LED bits for use with efm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -255,20 +255,4 @@ * Public Function Prototypes ****************************************************************************/ -/**************************************************************************** - * Name: efm32_ledinit, efm32_setled, and efm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * - ****************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void efm32_ledinit(void); -void efm32_setled(int led, bool ledon); -void efm32_setleds(uint8_t ledset); -#endif - #endif /* __CONFIGS_EFM32_DK3650_INCLUDE_BOARD_H */ diff --git a/configs/olimex-lpc-h3131/include/board.h b/configs/olimex-lpc-h3131/include/board.h index ca419ac7e5..395eddee2b 100644 --- a/configs/olimex-lpc-h3131/include/board.h +++ b/configs/olimex-lpc-h3131/include/board.h @@ -104,13 +104,13 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with lpc31_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 #define BOARD_NLEDS 2 -/* LED bits for use with lpc31_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -178,24 +178,6 @@ void lpc31_boardinitialize(void); } #endif -/************************************************************************************ - * Name: lpc31_setled, and lpc31_setleds - * - * Description: - * These interfaces allow user control of the board LEDs. - * - * If CONFIG_ARCH_LEDS is defined, then NuttX will control both on-board LEDs up - * until the completion of boot. The it will continue to control LED1; LED2 is - * avaiable for application use. - * - * If CONFIG_ARCH_LEDS is not defined, then both LEDs are available for application - * use. - * - ************************************************************************************/ - -void lpc31_setled(int led, bool ledon); -void lpc31_setleds(uint8_t ledset); - /************************************************************************************ * Name: lpc31_setup_overcurrent * diff --git a/configs/olimex-lpc1766stk/include/board.h b/configs/olimex-lpc1766stk/include/board.h index 0694e03306..c522b051df 100644 --- a/configs/olimex-lpc1766stk/include/board.h +++ b/configs/olimex-lpc1766stk/include/board.h @@ -141,13 +141,13 @@ * LED2 -- Connected to P0[4] */ -/* LED index values for use with lpc17_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 #define BOARD_NLEDS 2 -/* LED bits for use with lpc17_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -380,23 +380,7 @@ extern "C" { * ************************************************************************************/ -EXTERN void lpc17_boardinitialize(void); - -/************************************************************************************ - * Name: lpc17_ledinit, lpc17_setled, and lpc17_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void lpc17_ledinit(void); -EXTERN void lpc17_setled(int led, bool ledon); -EXTERN void lpc17_setleds(uint8_t ledset); -#endif +void lpc17_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/olimex-stm32-h405/include/board.h b/configs/olimex-stm32-h405/include/board.h index 260fc3dae8..462d34751d 100644 --- a/configs/olimex-stm32-h405/include/board.h +++ b/configs/olimex-stm32-h405/include/board.h @@ -137,12 +137,12 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_STATUS 0 #define BOARD_NLEDS 1 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_STATUS_BIT (1 << BOARD_LED1) @@ -210,22 +210,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/olimex-stm32-p207/include/board.h b/configs/olimex-stm32-p207/include/board.h index 0c55383514..c000536905 100644 --- a/configs/olimex-stm32-p207/include/board.h +++ b/configs/olimex-stm32-p207/include/board.h @@ -137,7 +137,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -150,7 +150,7 @@ #define BOARD_LED_RED BOARD_LED3 #define BOARD_LED_GREEN2 BOARD_LED4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -268,22 +268,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/olimexino-stm32/include/board.h b/configs/olimexino-stm32/include/board.h index 1d12872d13..ac695f9710 100644 --- a/configs/olimexino-stm32/include/board.h +++ b/configs/olimexino-stm32/include/board.h @@ -129,7 +129,7 @@ /* Leds *************************************************************************/ -/* LED index values for use with board_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED_GREEN BOARD_LED1 @@ -137,7 +137,7 @@ #define BOARD_LED_YELLOW BOARD_LED2 #define BOARD_NLEDS 2 -/* LED bits for use with board_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_GREEN_BIT (1 << BOARD_LED_GREEN) #define BOARD_LED_YELLOW_BIT (1 << BOARD_LED_YELLOW) @@ -203,21 +203,5 @@ void stm32_boardinitialize(void); } #endif -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_led_initialize(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_OLIMEXINO_STM32_INCLUDE_BOARD_H */ diff --git a/configs/open1788/include/board.h b/configs/open1788/include/board.h index b9eb04eaa1..c811ad4f66 100644 --- a/configs/open1788/include/board.h +++ b/configs/open1788/include/board.h @@ -226,7 +226,7 @@ * These LEDs are connecte to ground so a high output value will illuminate them. */ -/* LED index values for use with lpc17_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -234,7 +234,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with lpc17_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -465,23 +465,7 @@ extern "C" { * ************************************************************************************/ -EXTERN void lpc17_boardinitialize(void); - -/************************************************************************************ - * Name: lpc17_ledinit, lpc17_setled, and lpc17_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void lpc17_ledinit(void); -EXTERN void lpc17_setled(int led, bool ledon); -EXTERN void lpc17_setleds(uint8_t ledset); -#endif +void lpc17_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/pcduino-a10/include/board.h b/configs/pcduino-a10/include/board.h index 68c0a16066..11ea8fa18c 100644 --- a/configs/pcduino-a10/include/board.h +++ b/configs/pcduino-a10/include/board.h @@ -67,14 +67,14 @@ * 4. LED4 TX_LED LCD1_D15/ATAD11/KP_IN5/SMC_VPPPP/EINT15/CSI1_D15/PH15 */ -/* LED index values for use with a1x_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED3 1 #define BOARD_LED4 2 #define BOARD_NLEDS 3 -/* LED bits for use with a1x_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED3_BIT (1 << BOARD_LED3) @@ -186,21 +186,6 @@ extern "C" { void a1x_boardinitialize(void); -/************************************************************************************ - * Name: a1x_setled, and a1x_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void a1x_setled(int led, bool ledon); -void a1x_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/pic32mx-starterkit/include/board.h b/configs/pic32mx-starterkit/include/board.h index e486f6543c..98333e9674 100644 --- a/configs/pic32mx-starterkit/include/board.h +++ b/configs/pic32mx-starterkit/include/board.h @@ -125,14 +125,14 @@ * RC2 LED5 */ -/* LED index values for use with pic32mx_setled() */ +/* LED index values for use with board_userled() */ #define PIC32MX_STARTERKIT_LED1 0 #define PIC32MX_STARTERKIT_LED2 1 #define PIC32MX_STARTERKIT_LED3 2 #define PIC32MX_STARTERKIT_NLEDS 3 -/* LED bits for use with pic32mx_setleds() */ +/* LED bits for use with board_userled_all() */ #define PIC32MX_STARTERKIT_LED1_BIT (1 << PIC32MX_STARTERKIT_LED1) #define PIC32MX_STARTERKIT_LED2_BIT (1 << PIC32MX_STARTERKIT_LED2) @@ -185,39 +185,18 @@ * Inline Functions ****************************************************************************/ -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Name: pic32mx_ledinit and pic32mx_setled - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applicaitons. - * + * Public Function Prototypes ****************************************************************************/ -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_ledinit(void); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setled(int led, bool ledon); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setleds(uint8_t ledset); -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/configs/pic32mx7mmb/include/board.h b/configs/pic32mx7mmb/include/board.h index f813341d69..ff6b417b1d 100644 --- a/configs/pic32mx7mmb/include/board.h +++ b/configs/pic32mx7mmb/include/board.h @@ -126,14 +126,14 @@ * controlled LED. */ -/* LED index values for use with pic32mx_setled() */ +/* LED index values for use with board_userled() */ #define PIC32MX_PIC32MX7MMB_LED0 0 #define PIC32MX_PIC32MX7MMB_LED1 1 #define PIC32MX_PIC32MX7MMB_LED2 2 #define PIC32MX_PIC32MX7MMB_NLEDS 3 -/* LED bits for use with pic32mx_setleds() */ +/* LED bits for use with board_userled_all() */ #define PIC32MX_PIC32MX7MMB_LED0_BIT (1 << PIC32MX_PIC32MX7MMB_LED0) #define PIC32MX_PIC32MX7MMB_LED1_BIT (1 << PIC32MX_PIC32MX7MMB_LED1) @@ -191,39 +191,18 @@ * Inline Functions ****************************************************************************/ -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Name: pic32mx_ledinit and pic32mx_setled - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applicaitons. - * + * Public Function Prototypes ****************************************************************************/ -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_ledinit(void); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setled(int led, bool ledon); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setleds(uint8_t ledset); -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/configs/pic32mz-starterkit/include/board.h b/configs/pic32mz-starterkit/include/board.h index 122cc28c0d..3259ce2c32 100644 --- a/configs/pic32mz-starterkit/include/board.h +++ b/configs/pic32mz-starterkit/include/board.h @@ -185,14 +185,14 @@ * RH2 LED2 High illuminates (GREEN) */ -/* LED index values for use with pic32mz_setled() */ +/* LED index values for use with board_userled() */ #define PIC32MZ_STARTERKIT_LED1 0 #define PIC32MZ_STARTERKIT_LED2 1 #define PIC32MZ_STARTERKIT_LED3 2 #define PIC32MZ_STARTERKIT_NLEDS 3 -/* LED bits for use with pic32mz_setleds() */ +/* LED bits for use with board_userled_all() */ #define PIC32MZ_STARTERKIT_LED1_BIT (1 << PIC32MZ_STARTERKIT_LED1) #define PIC32MZ_STARTERKIT_LED2_BIT (1 << PIC32MZ_STARTERKIT_LED2) @@ -295,10 +295,6 @@ * Inline Functions ****************************************************************************/ -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #ifdef __cplusplus #define EXTERN extern "C" extern "C" @@ -308,21 +304,9 @@ extern "C" #endif /**************************************************************************** - * Name: pic32mz_ledinit and pic32mz_setled - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applications. - * + * Public Function Prototypes ****************************************************************************/ -#ifndef CONFIG_ARCH_LEDS -void pic32mz_ledinit(void); -void pic32mz_setled(int led, bool ledon); -void pic32mz_setleds(uint8_t ledset); -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/configs/sam4e-ek/include/board.h b/configs/sam4e-ek/include/board.h index 2a17c88de1..8a9c965ac1 100644 --- a/configs/sam4e-ek/include/board.h +++ b/configs/sam4e-ek/include/board.h @@ -238,14 +238,14 @@ #define LED_ASSERTION 6 /* LED0=TOG LED1=XXX LED2=XXX */ #define LED_PANIC 7 /* LED0=TOG LED1=XXX LED2=XXX */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_D3 0 #define BOARD_LED_D2 1 #define BOARD_LED_D4 2 #define BOARD_NLEDS 3 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_D3_BIT (1 << BOARD_LED_D3) #define BOARD_LED_D2_BIT (1 << BOARD_LED_D2) @@ -295,22 +295,6 @@ extern "C" void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: sam_lcdclear * @@ -324,7 +308,7 @@ void sam_setleds(uint8_t ledset); #if defined(CONFIG_SAM4EEK_LCD_RGB565) void sam_lcdclear(uint16_t color); -#else /* if defined(CONFIG_SAM4EEK_LCD_RGB24) defined(CONFIG_SAM4EEK_LCD_RGB32) */ +#else /* CONFIG_SAM4EEK_LCD_RGB24 || CONFIG_SAM4EEK_LCD_RGB32 */ void sam_lcdclear(uint32_t color); #endif diff --git a/configs/sam4l-xplained/include/board.h b/configs/sam4l-xplained/include/board.h index fc1269d694..f299f063ec 100644 --- a/configs/sam4l-xplained/include/board.h +++ b/configs/sam4l-xplained/include/board.h @@ -203,12 +203,12 @@ * PC07 to GND. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED0 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED0_BIT (1 << BOARD_LED0) @@ -296,7 +296,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -316,22 +317,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sam4s-xplained-pro/include/board.h b/configs/sam4s-xplained-pro/include/board.h index 37fca8b372..58380480a9 100644 --- a/configs/sam4s-xplained-pro/include/board.h +++ b/configs/sam4s-xplained-pro/include/board.h @@ -202,12 +202,12 @@ * Both can be illuminated by driving the GPIO output to ground (low). */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_D301 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_D301_BIT (1 << BOARD_D301) @@ -260,7 +260,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -280,22 +281,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sam4s-xplained/include/board.h b/configs/sam4s-xplained/include/board.h index a6873172a7..7fc97d5ccc 100644 --- a/configs/sam4s-xplained/include/board.h +++ b/configs/sam4s-xplained/include/board.h @@ -178,13 +178,13 @@ * Both can be illuminated by driving the GPIO output to ground (low). */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_D9 0 #define BOARD_D10 1 #define BOARD_NLEDS 2 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_D9_BIT (1 << BOARD_D9) #define BOARD_D10_BIT (1 << BOARD_D10) @@ -236,7 +236,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -256,22 +257,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sama5d2-xult/include/board.h b/configs/sama5d2-xult/include/board.h index dc3ac10c3a..6408b13808 100644 --- a/configs/sama5d2-xult/include/board.h +++ b/configs/sama5d2-xult/include/board.h @@ -118,24 +118,24 @@ */ #ifndef CONFIG_ARCH_LEDS -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_GREEN 0 #define BOARD_BLUE 1 #define BOARD_NLEDS 2 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_GREEN_BIT (1 << BOARD_GREEN) #define BOARD_BLUE_BIT (1 << BOARD_BLUE) #else -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_BLUE 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_BLUE_BIT (1 << BOARD_BLUE) #endif @@ -297,20 +297,6 @@ extern "C" void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * The following interfaces are available to control the LEDs from user - * applications. If CONFIG_ARCH_LEDS is defined, then NuttX will control the - * green LEDs. - * - ************************************************************************************/ - -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sama5d3-xplained/include/board.h b/configs/sama5d3-xplained/include/board.h index db5f1c47f5..2358af2a0e 100644 --- a/configs/sama5d3-xplained/include/board.h +++ b/configs/sama5d3-xplained/include/board.h @@ -114,13 +114,13 @@ * LCD is illuminated by a high output. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_BLUE 0 #define BOARD_RED 1 #define BOARD_NLEDS 2 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_BLUE_BIT (1 << BOARD_BLUE) #define BOARD_RED_BIT (1 << BOARD_RED) @@ -311,7 +311,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -331,22 +332,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sama5d3x-ek/include/board.h b/configs/sama5d3x-ek/include/board.h index 2aa6f0c818..9c16288885 100644 --- a/configs/sama5d3x-ek/include/board.h +++ b/configs/sama5d3x-ek/include/board.h @@ -135,7 +135,7 @@ * LCD is illuminated by a high output. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_BLUE 0 #ifdef CONFIG_SAMA5D3xEK_NOREDLED @@ -145,7 +145,7 @@ # define BOARD_NLEDS 2 #endif -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_BLUE_BIT (1 << BOARD_BLUE) #ifndef CONFIG_SAMA5D3xEK_NOREDLED @@ -352,7 +352,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -372,22 +373,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/sama5d4-ek/include/board.h b/configs/sama5d4-ek/include/board.h index 6b170df4d1..4adea19bc8 100644 --- a/configs/sama5d4-ek/include/board.h +++ b/configs/sama5d4-ek/include/board.h @@ -119,13 +119,13 @@ * off. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_USER 0 #define BOARD_POWER 1 #define BOARD_NLEDS 2 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_USER_BIT (1 << BOARD_BLUE) #define BOARD_POWER_BIT (1 << BOARD_RED) @@ -282,7 +282,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -302,22 +303,6 @@ extern "C" { void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/samd20-xplained/include/board.h b/configs/samd20-xplained/include/board.h index f98c0f9c58..0ca6fab1e8 100644 --- a/configs/samd20-xplained/include/board.h +++ b/configs/samd20-xplained/include/board.h @@ -490,12 +490,12 @@ * PA14 to GND. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_STATUS_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_STATUS LED_BIT (1 << BOARD_STATUS_LED) @@ -550,6 +550,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: sam_boardinitialize * @@ -562,22 +563,6 @@ extern "C" void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/samd21-xplained/include/board.h b/configs/samd21-xplained/include/board.h index 73279ec49a..7f68514e3d 100644 --- a/configs/samd21-xplained/include/board.h +++ b/configs/samd21-xplained/include/board.h @@ -490,12 +490,12 @@ * PB30 to GND. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_STATUS_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_STATUS LED_BIT (1 << BOARD_STATUS_LED) @@ -550,6 +550,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: sam_boardinitialize * @@ -562,22 +563,6 @@ extern "C" void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/saml21-xplained/include/board.h b/configs/saml21-xplained/include/board.h index 5dfc932aab..7decc79f16 100644 --- a/configs/saml21-xplained/include/board.h +++ b/configs/saml21-xplained/include/board.h @@ -614,12 +614,12 @@ * PB10 to GND. */ -/* LED index values for use with sam_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_STATUS_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with sam_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_STATUS LED_BIT (1 << BOARD_STATUS_LED) @@ -674,6 +674,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: sam_boardinitialize * @@ -686,22 +687,6 @@ extern "C" void sam_boardinitialize(void); -/************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/samv71-xult/include/board.h b/configs/samv71-xult/include/board.h index ee192211cf..6a7448f79c 100644 --- a/configs/samv71-xult/include/board.h +++ b/configs/samv71-xult/include/board.h @@ -203,13 +203,13 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with lpc31_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED0 0 #define BOARD_LED1 1 #define BOARD_NLEDS 2 -/* LED bits for use with lpc31_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED0_BIT (1 << BOARD_LED0) #define BOARD_LED1_BIT (1 << BOARD_LED1) @@ -545,22 +545,6 @@ extern "C" * Public Functions ************************************************************************************/ - /************************************************************************************ - * Name: sam_ledinit, sam_setled, and sam_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void sam_ledinit(void); -void sam_setled(int led, bool ledon); -void sam_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: sam_lcdclear * diff --git a/configs/shenzhou/include/board.h b/configs/shenzhou/include/board.h index dd0c8f957e..c7b60a9ca3 100644 --- a/configs/shenzhou/include/board.h +++ b/configs/shenzhou/include/board.h @@ -124,7 +124,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -132,7 +132,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -368,22 +368,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: stm32_lcdclear * diff --git a/configs/spark/include/board.h b/configs/spark/include/board.h index 8b0c6e68fb..197f53ebb8 100644 --- a/configs/spark/include/board.h +++ b/configs/spark/include/board.h @@ -153,7 +153,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 /* Tied to LED_USR */ #define BOARD_LED2 1 /* Tied to LED_RGB RED */ @@ -166,7 +166,7 @@ #define BOARD_RGB_LED_GREEN BOARD_LED4 #define BOARD_RGB_LED_BLUE BOARD_LED2 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_USR_LED_BIT (1 << BOARD_USR_LED_BLUE) #define BOARD_RED_LED_BIT (1 << BOARD_RGB_LED_RED) @@ -226,23 +226,6 @@ extern "C" * Public Function Prototypes ************************************************************************************/ -/************************************************************************************ - * Name: board_autoled_initialize, up_setled, and up_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -#undef board_autoled_initialize // Remove macro definition to reuse name -void board_autoled_initialize(void); -void up_setled(int led, bool ledon); -void up_setleds(uint8_t ledset, uint8_t led_states_set); -#endif - /************************************************************************************ * Name: stm32_boardinitialize * diff --git a/configs/stm3220g-eval/include/board.h b/configs/stm3220g-eval/include/board.h index d896403ddc..d8dad32f74 100644 --- a/configs/stm3220g-eval/include/board.h +++ b/configs/stm3220g-eval/include/board.h @@ -219,7 +219,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -227,7 +227,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -445,7 +445,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -463,23 +464,7 @@ extern "C" { * ************************************************************************************/ -EXTERN void stm32_boardinitialize(void); - -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void stm32_ledinit(void); -EXTERN void stm32_setled(int led, bool ledon); -EXTERN void stm32_setleds(uint8_t ledset); -#endif +void stm32_boardinitialize(void); /************************************************************************************ * Name: stm3220g_lcdclear @@ -493,7 +478,7 @@ EXTERN void stm32_setleds(uint8_t ledset); ************************************************************************************/ #ifdef CONFIG_STM32_FSMC -EXTERN void stm3220g_lcdclear(uint16_t color); +void stm3220g_lcdclear(uint16_t color); #endif #undef EXTERN diff --git a/configs/stm3240g-eval/include/board.h b/configs/stm3240g-eval/include/board.h index bb57d025ff..d693bdacf6 100644 --- a/configs/stm3240g-eval/include/board.h +++ b/configs/stm3240g-eval/include/board.h @@ -218,7 +218,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -226,7 +226,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -464,7 +464,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -484,22 +485,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - /************************************************************************************ * Name: stm3240g_lcdclear * diff --git a/configs/stm32f3discovery/include/board.h b/configs/stm32f3discovery/include/board.h index 80fcfc3ec5..bb53ff3757 100644 --- a/configs/stm32f3discovery/include/board.h +++ b/configs/stm32f3discovery/include/board.h @@ -176,7 +176,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 /* User LD3 */ #define BOARD_LED2 1 /* User LD4 */ @@ -188,7 +188,7 @@ #define BOARD_LED8 7 /* User LD10 */ #define BOARD_NLEDS 8 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -266,7 +266,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -274,6 +275,7 @@ extern "C" { /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: stm32_boardinitialize * @@ -284,23 +286,7 @@ extern "C" { * ************************************************************************************/ -EXTERN void stm32_boardinitialize(void); - -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -EXTERN void stm32_ledinit(void); -EXTERN void stm32_setled(int led, bool ledon); -EXTERN void stm32_setleds(uint8_t ledset); -#endif +void stm32_boardinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/configs/stm32f429i-disco/include/board.h b/configs/stm32f429i-disco/include/board.h index 9c0418ca34..700db55c21 100644 --- a/configs/stm32f429i-disco/include/board.h +++ b/configs/stm32f429i-disco/include/board.h @@ -162,7 +162,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -171,7 +171,7 @@ #define BOARD_LED_GREEN BOARD_LED1 #define BOARD_LED_ORANGE BOARD_LED2 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -428,7 +428,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -436,6 +437,7 @@ extern "C" { /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: stm32_boardinitialize * @@ -448,22 +450,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/stm32f4discovery/include/board.h b/configs/stm32f4discovery/include/board.h index 4d0720fa36..522dabd68f 100644 --- a/configs/stm32f4discovery/include/board.h +++ b/configs/stm32f4discovery/include/board.h @@ -194,7 +194,7 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -207,7 +207,7 @@ #define BOARD_LED_RED BOARD_LED3 #define BOARD_LED_BLUE BOARD_LED4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -358,6 +358,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: stm32_boardinitialize * @@ -370,22 +371,6 @@ extern "C" void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/stm32f746g-disco/include/board.h b/configs/stm32f746g-disco/include/board.h index cd26b560cb..6e9da62de0 100644 --- a/configs/stm32f746g-disco/include/board.h +++ b/configs/stm32f746g-disco/include/board.h @@ -223,14 +223,14 @@ * The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_NLEDS 1 #define BOARD_LD1 BOARD_LED1 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) @@ -334,6 +334,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: stm32_boardinitialize * @@ -346,22 +347,6 @@ extern "C" void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/stm32ldiscovery/include/board.h b/configs/stm32ldiscovery/include/board.h index 1645aa3bfd..acb33b45ec 100644 --- a/configs/stm32ldiscovery/include/board.h +++ b/configs/stm32ldiscovery/include/board.h @@ -180,13 +180,13 @@ * way. The following definitions are used to access individual LEDs. */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 /* User LD3 */ #define BOARD_LED2 1 /* User LD4 */ #define BOARD_NLEDS 2 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -284,7 +284,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -292,6 +293,7 @@ extern "C" { /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: stm32_boardinitialize * @@ -304,22 +306,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - /**************************************************************************** * Name: stm32_slcd_initialize * diff --git a/configs/stm32vldiscovery/include/board.h b/configs/stm32vldiscovery/include/board.h index ee6783bd6b..efbb3f3e8c 100644 --- a/configs/stm32vldiscovery/include/board.h +++ b/configs/stm32vldiscovery/include/board.h @@ -168,22 +168,6 @@ extern "C" void stm32_boardinitialize(void); -/************************************************************************************ - * Name: stm32_ledinit, stm32_setled, and stm32_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void stm32_ledinit(void); -void stm32_setled(int led, bool ledon); -void stm32_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/teensy-3.x/include/board.h b/configs/teensy-3.x/include/board.h index fb00aee4e7..5fc8db18e7 100644 --- a/configs/teensy-3.x/include/board.h +++ b/configs/teensy-3.x/include/board.h @@ -137,12 +137,12 @@ * high will illuminate the LED. */ -/* LED index values for use with kinetis_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED 0 #define BOARD_NLEDS 1 -/* LED bits for use with kinetis_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_BIT (1 << BOARD_LED) @@ -219,6 +219,7 @@ extern "C" /************************************************************************************ * Public Function Prototypes ************************************************************************************/ + /************************************************************************************ * Name: kinetis_boardinitialize * @@ -231,22 +232,6 @@ extern "C" void kinetis_boardinitialize(void); -/************************************************************************************ - * Name: kinetis_ledinit, kinetis_setled, and kinetis_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void kinetis_ledinit(void); -void kinetis_setled(int led, bool ledon); -void kinetis_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/tm4c123g-launchpad/include/board.h b/configs/tm4c123g-launchpad/include/board.h index dc8029a9f0..e74db2d27b 100644 --- a/configs/tm4c123g-launchpad/include/board.h +++ b/configs/tm4c123g-launchpad/include/board.h @@ -117,14 +117,14 @@ * BOARD_LED_B -- Connected to PF2 */ -/* LED index values for use with tm4c_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_R 0 #define BOARD_LED_G 1 #define BOARD_LED_B 2 #define BOARD_NLEDS 3 -/* LED bits for use with tm4c_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -202,21 +202,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tm4c_ledinit, tm4c_setled, and tm4c_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void tm4c_ledinit(void); -void tm4c_setled(int led, bool ledon); -void tm4c_setleds(uint8_t ledset); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/configs/tm4c1294-launchpad/include/board.h b/configs/tm4c1294-launchpad/include/board.h index c0cbac2a74..99b018a221 100644 --- a/configs/tm4c1294-launchpad/include/board.h +++ b/configs/tm4c1294-launchpad/include/board.h @@ -128,7 +128,7 @@ * --- ------------ */ -/* LED index values for use with tiva_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED_D1 0 #define BOARD_LED_D2 1 @@ -136,7 +136,7 @@ #define BOARD_LED_D4 3 #define BOARD_NLEDS 4 -/* LED bits for use with tiva_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED_D1_BIT (1 << BOARD_LED_D1) #define BOARD_LED_D2_BIT (1 << BOARD_LED_D2) @@ -206,21 +206,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ledinit, tiva_setled, and tiva_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LED. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void tiva_ledinit(void); -void tiva_setled(int led, bool ledon); -void tiva_setleds(uint8_t ledset); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/configs/ubw32/include/board.h b/configs/ubw32/include/board.h index 710479a10f..df2130cbf8 100644 --- a/configs/ubw32/include/board.h +++ b/configs/ubw32/include/board.h @@ -102,14 +102,14 @@ * PWR Blue Illuminated when 5V is present, not controlled by software */ -/* LED index values for use with pic32mx_setled() */ +/* LED index values for use with board_userled() */ #define PIC32MX_UBW32_LED1 0 #define PIC32MX_UBW32_LED2 1 #define PIC32MX_UBW32_LED3 2 #define PIC32MX_UBW32_NLEDS 3 -/* LED bits for use with pic32mx_setleds() */ +/* LED bits for use with board_userled_all() */ #define PIC32MX_UBW32_LED1_BIT (1 << PIC32MX_UBW32_LED1) #define PIC32MX_UBW32_LED2_BIT (1 << PIC32MX_UBW32_LED2) @@ -166,39 +166,18 @@ * Inline Functions ****************************************************************************/ -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /**************************************************************************** - * Name: pic32mx_ledinit and pic32mx_setled - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board - * LEDs. If CONFIG_ARCH_LEDS is not defined, then the following interfaces - * are available to control the LEDs from user applicaitons. - * + * Public Function Prototypes ****************************************************************************/ -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_ledinit(void); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setled(int led, bool ledon); -#endif - -#ifndef CONFIG_ARCH_LEDS -EXTERN void pic32mx_setleds(uint8_t ledset); -#endif - #undef EXTERN #ifdef __cplusplus } diff --git a/configs/viewtool-stm32f107/include/board.h b/configs/viewtool-stm32f107/include/board.h index 0116146104..242feeb67a 100644 --- a/configs/viewtool-stm32f107/include/board.h +++ b/configs/viewtool-stm32f107/include/board.h @@ -75,7 +75,7 @@ * LED4 PB13 */ -/* LED index values for use with stm32_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 @@ -83,7 +83,7 @@ #define BOARD_LED4 3 #define BOARD_NLEDS 4 -/* LED bits for use with stm32_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2) @@ -159,21 +159,6 @@ extern "C" { void stm32_boardinitialize(void); -/************************************************************************************ - * Name: up_setled and up_setleds - * - * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfaces are available to - * control the LEDs from user applications. - * - ************************************************************************************/ - -#ifndef CONFIG_ARCH_LEDS -void up_setled(int led, bool ledon); -void up_setleds(uint8_t ledset); -#endif - #undef EXTERN #if defined(__cplusplus) } diff --git a/configs/zkit-arm-1769/include/board.h b/configs/zkit-arm-1769/include/board.h index 66e86f8f9b..544ce3d133 100644 --- a/configs/zkit-arm-1769/include/board.h +++ b/configs/zkit-arm-1769/include/board.h @@ -146,13 +146,13 @@ * LED2 -- Connected to P0[21] */ -/* LED index values for use with lpc17_setled() */ +/* LED index values for use with board_userled() */ #define BOARD_LED1 0 #define BOARD_LED2 1 #define BOARD_NLEDS 2 -/* LED bits for use with lpc17_setleds() */ +/* LED bits for use with board_userled_all() */ #define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED2_BIT (1 << BOARD_LED2)