diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c b/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c index 103e1067946..4bad98c919e 100644 --- a/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c +++ b/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c @@ -68,7 +68,7 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { # warning Missing logic } diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c b/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c index 0d3c1b3c0bf..4cace9e0890 100644 --- a/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c +++ b/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c @@ -68,7 +68,7 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { # warning Missing logic } diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_buttons.c b/boards/arm/cxd56xx/spresense/src/cxd56_buttons.c index fd3ca0ffa19..dde3fc451ad 100644 --- a/boards/arm/cxd56xx/spresense/src/cxd56_buttons.c +++ b/boards/arm/cxd56xx/spresense/src/cxd56_buttons.c @@ -71,8 +71,9 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { + return 0; } /**************************************************************************** diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c index 1cdfd6d861b..5eb8d85841d 100644 --- a/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c @@ -102,7 +102,7 @@ static const gpio_pinset_t g_button_boards[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -112,6 +112,8 @@ void board_button_initialize(void) { efm32_configgpio(g_button_boards[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c index b0ceacd0c76..ada8d3744b3 100644 --- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c @@ -80,11 +80,12 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the buttons as input */ imxrt_config_gpio(GPIO_SWWAKE); + return 1; } /**************************************************************************** diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c index 2ac4c036087..626539fb6b3 100644 --- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c @@ -79,11 +79,12 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the button as input */ imxrt_config_gpio(GPIO_SW8); + return 1; } /**************************************************************************** diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c index 816d77bf076..75e4f4cf241 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c @@ -80,11 +80,12 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the button as input */ imxrt_config_gpio(GPIO_SW8); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_buttons.c b/boards/arm/kinetis/freedom-k64f/src/k64_buttons.c index 33ce907b136..1320486cfd8 100644 --- a/boards/arm/kinetis/freedom-k64f/src/k64_buttons.c +++ b/boards/arm/kinetis/freedom-k64f/src/k64_buttons.c @@ -81,12 +81,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the two buttons as inputs */ kinetis_pinconfig(GPIO_SW2); kinetis_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_buttons.c b/boards/arm/kinetis/freedom-k66f/src/k66_buttons.c index ab84718649b..0235ebddbd5 100644 --- a/boards/arm/kinetis/freedom-k66f/src/k66_buttons.c +++ b/boards/arm/kinetis/freedom-k66f/src/k66_buttons.c @@ -85,12 +85,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the two buttons as inputs */ kinetis_pinconfig(GPIO_SW2); kinetis_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c b/boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c index 28599c5f8c6..90e2ea7be38 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c +++ b/boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c @@ -65,9 +65,11 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* The KwikStik-K40 board has no standard GPIO contact buttons */ + + return 0; } /**************************************************************************** diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_buttons.c b/boards/arm/kinetis/twr-k60n512/src/k60_buttons.c index 0622dc7a7d7..20722cec64f 100644 --- a/boards/arm/kinetis/twr-k60n512/src/k60_buttons.c +++ b/boards/arm/kinetis/twr-k60n512/src/k60_buttons.c @@ -82,12 +82,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the two buttons as inputs */ kinetis_pinconfig(GPIO_SW1); kinetis_pinconfig(GPIO_SW2); + return 2; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c index f457f44bde7..fdf102b0c4c 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c @@ -99,7 +99,7 @@ static uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -109,6 +109,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c index 93ac0341846..cd4c220b770 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c @@ -113,7 +113,7 @@ static const uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -123,6 +123,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c index 4758169c824..fe06b10cfdd 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c @@ -102,7 +102,7 @@ static const uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -112,6 +112,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c index 8f018bdb075..15c3c518781 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c @@ -102,7 +102,7 @@ static uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -112,6 +112,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c index d61e2463321..7bc06a4bab0 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c @@ -114,7 +114,7 @@ static const uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -124,6 +124,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c index 572e2b885fe..ae01b0f1ed4 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c @@ -91,7 +91,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -103,6 +103,8 @@ void board_button_initialize(void) { lpc17_40_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c b/boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c index 72ad3db9334..9a3f5645841 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c @@ -57,8 +57,9 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { + return 0; } /**************************************************************************** diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c b/boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c index 506620ecb2c..8ecebffe0b2 100644 --- a/boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c +++ b/boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c @@ -57,8 +57,9 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { + return 0; } /**************************************************************************** diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c index 6d7a8511029..43cacf86e4c 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c +++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c @@ -92,7 +92,7 @@ static uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -102,6 +102,8 @@ void board_button_initialize(void) { lpc43_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c index 8b8ea1c18b1..fe9180777d3 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c @@ -99,7 +99,7 @@ static uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -109,6 +109,8 @@ void board_button_initialize(void) { lpc43_configgpio(g_buttoncfg[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c index 62791e20e27..3c02a7ffe03 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c @@ -99,7 +99,7 @@ static uint8_t g_buttonirq[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { #if 0 /* Not yet implemented */ int i; @@ -110,6 +110,8 @@ void board_button_initialize(void) { lpc43_configgpio(g_buttoncfg[i]); } +#else + return 0; #endif } diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c index ba361cb4f7f..d198f796677 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c @@ -110,7 +110,7 @@ static int board_button_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int ret; @@ -128,6 +128,8 @@ void board_button_initialize(void) irq_attach(g_button_irq, board_button_interrupt, NULL); #endif } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_button.c b/boards/arm/max326xx/max32660-evsys/src/max326_button.c index d77e4a0475c..1449f8ded35 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max326_button.c +++ b/boards/arm/max326xx/max32660-evsys/src/max326_button.c @@ -70,9 +70,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { max326_gpio_config(GPIO_BUTTON); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_buttons.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_buttons.c index 0b8e9471447..922fdd83db2 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_buttons.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_buttons.c @@ -83,7 +83,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -93,6 +93,8 @@ void board_button_initialize(void) { nrf52_gpio_config(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_buttons.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_buttons.c index 6551ad07362..904b77c34e4 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_buttons.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_buttons.c @@ -83,7 +83,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -93,6 +93,8 @@ void board_button_initialize(void) { nrf52_gpio_config(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_buttons.c index f5cf6e2a286..f619219b216 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW2); s32k1xx_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c index 81fc9688f07..ff48587baf6 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW2); s32k1xx_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_buttons.c index b03eb8647c6..3d1636f4814 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW2); s32k1xx_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_buttons.c index d6c84d486b8..163364af9d6 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW2); s32k1xx_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_buttons.c index 4eb3653372e..0cd08b95be0 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW2); s32k1xx_pinconfig(GPIO_SW3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_buttons.c index 5ecc5fd0e08..70c67b9ac4a 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_buttons.c +++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_buttons.c @@ -73,12 +73,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uin32_t board_button_initialize(void) { /* Configure the GPIO pins as interrupting inputs. */ s32k1xx_pinconfig(GPIO_SW3); s32k1xx_pinconfig(GPIO_SW4); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c index defb2efbeec..d2ae419b638 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c @@ -116,10 +116,11 @@ static int board_button_irqx(gpio_pinset_t pinset, int irq, xcpt_t irqhandler, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configgpio(GPIO_BUTTON1); sam_configgpio(GPIO_BUTTON2); + return 2; } /**************************************************************************** diff --git a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c index 0b577d5e795..f9c6b64fc27 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c @@ -116,12 +116,13 @@ static int board_button_irqx(gpio_pinset_t pinset, int irq, xcpt_t irqhandler, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configgpio(GPIO_SCROLLUP); sam_configgpio(GPIO_SCROLLDWN); sam_configgpio(GPIO_WAKU); sam_configgpio(GPIO_TAMP); + return 4; } /**************************************************************************** diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c index 1a13f02618b..5858c1c5e4c 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c @@ -68,9 +68,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configgpio(GPIO_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c index 7ee1011053d..aee2783ada6 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c @@ -70,9 +70,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configgpio(GPIO_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c index 24207e1001c..d01f5c596c3 100644 --- a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c +++ b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c @@ -69,9 +69,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configgpio(GPIO_BP2); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c index e2b72c77173..182bf04809c 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configpio(PIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c index 8c6d5928255..7dd90ab7aec 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c @@ -85,9 +85,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configpio(PIO_USER); + return 1; } /**************************************************************************** diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c index a10446cf380..29653a73ba0 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c @@ -84,9 +84,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configpio(PIO_USER1); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c index 21e778156cb..67e6b2773ad 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c @@ -80,9 +80,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configpio(PIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c index fdeaca10208..9483c8ee1ae 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c @@ -69,9 +69,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configport(PORT_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c index d12d2d0a9c5..750c50c4687 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c @@ -69,9 +69,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configport(PORT_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c index 301104e259d..2f761be02de 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c @@ -69,9 +69,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { sam_configport(PORT_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/samv7/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c index 9da506592ab..a4ec7dd8138 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_buttons.c +++ b/boards/arm/samv7/same70-xplained/src/sam_buttons.c @@ -129,11 +129,12 @@ static int board_button_irqx(gpio_pinset_t pinset, int irq, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure button PIOs */ sam_configgpio(GPIO_SW0); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/samv7/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c index b47239d42d9..48ab42a43fc 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_buttons.c +++ b/boards/arm/samv7/samv71-xult/src/sam_buttons.c @@ -133,7 +133,7 @@ static int board_button_irqx(gpio_pinset_t pinset, int irq, xcpt_t irqhandler, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { uint32_t regval; @@ -150,6 +150,7 @@ void board_button_initialize(void) sam_configgpio(GPIO_SW0); sam_configgpio(GPIO_SW1); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/axoloti/src/stm32_buttons.c b/boards/arm/stm32/axoloti/src/stm32_buttons.c index 0d7e6ca311e..d7a66630733 100644 --- a/boards/arm/stm32/axoloti/src/stm32_buttons.c +++ b/boards/arm/stm32/axoloti/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c b/boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c index 96b5bf200cc..067a6eae5d2 100644 --- a/boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c +++ b/boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c @@ -68,12 +68,13 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure BUTTONS T2-T3 GPIOs for input */ stm32_configgpio(GPIO_BTN_T2); stm32_configgpio(GPIO_BTN_T3); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/cloudctrl/src/stm32_buttons.c b/boards/arm/stm32/cloudctrl/src/stm32_buttons.c index 35809f8866b..6c82372926c 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_buttons.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_buttons.c @@ -86,7 +86,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -98,6 +98,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c b/boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c index 53c41c58b40..fa5cf39d4ca 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c @@ -77,7 +77,7 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are * configured for some pins but NOT used in this file @@ -85,6 +85,7 @@ void board_button_initialize(void) stm32_configgpio(GPIO_BTN_KEY1); stm32_configgpio(GPIO_BTN_KEY2); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c b/boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c index 4297fa8cab6..107973b2d80 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c @@ -67,10 +67,11 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_KEYA); stm32_configgpio(GPIO_BTN_KEYB); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c index e3bfe40c06b..ae4093e6572 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c @@ -66,13 +66,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c index 54f53c7917f..7df9e9b8a78 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c index 17b3c5af1a9..96c9010efe5 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c @@ -66,13 +66,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c index a25c3eee856..3531ab551d6 100644 --- a/boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c @@ -68,13 +68,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c index 41b2a493138..b95a3f3f76f 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c index 0f247d4c0ea..d0056909b4c 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c @@ -65,13 +65,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_buttons.c index 40e9e6e7ac4..1b0008df594 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_buttons.c @@ -52,9 +52,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c index 8dc84330b99..8cedc22b54a 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c @@ -65,13 +65,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c index 93a1bec47ba..17137ef2364 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c @@ -67,13 +67,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c index 6a5e8a2df7e..0d0e621ff8d 100644 --- a/boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c +++ b/boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c @@ -66,13 +66,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c index 01b55130397..394e1103b6c 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c index a3322962719..8baaf7ea955 100644 --- a/boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c +++ b/boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c index f7c0c7d69f7..cfb569a8e37 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c index 7949c378db6..8d7c259410e 100644 --- a/boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c +++ b/boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c @@ -84,7 +84,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -96,6 +96,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c index 980a951275b..25148dc5517 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c +++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c @@ -86,7 +86,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -98,6 +98,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c b/boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c index ba90f061062..ecaad039e77 100644 --- a/boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c +++ b/boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c @@ -85,9 +85,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(BUTTON_BOOT0n); + return 1; } /**************************************************************************** diff --git a/boards/arm/stm32/photon/src/stm32_buttons.c b/boards/arm/stm32/photon/src/stm32_buttons.c index 2f5daf1bf2f..f96cea1a20a 100644 --- a/boards/arm/stm32/photon/src/stm32_buttons.c +++ b/boards/arm/stm32/photon/src/stm32_buttons.c @@ -55,11 +55,12 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure Photon button gpio as input */ stm32_configgpio(GPIO_BUTTON1); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/shenzhou/src/stm32_buttons.c b/boards/arm/stm32/shenzhou/src/stm32_buttons.c index 72490f1d5f2..bfb1dea382c 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_buttons.c +++ b/boards/arm/stm32/shenzhou/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c index be263ff2078..627c5e4630f 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c @@ -91,7 +91,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -103,6 +103,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c index d104bc5ad22..c445c8f4548 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c index fd636e90dcd..8a67636ef43 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c @@ -86,7 +86,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -98,6 +98,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c b/boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c index dc335b81df2..1c30d46ef33 100644 --- a/boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c @@ -75,7 +75,7 @@ static const uint32_t buttons[NUM_BUTTONS] = * Initializes gpio pins for joystick buttons ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -83,6 +83,8 @@ void board_button_initialize(void) { stm32_configgpio(buttons[i]); } + + return NUM_BUTTONS; } /***************************************************************************** diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c index ed0c278763f..55a5165dbfb 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c @@ -87,7 +87,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -99,6 +99,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c b/boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c index c034afeb30c..42ceb33760a 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c index 984dcf96da1..a8c41fb0215 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c b/boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c index 529c9aae68b..5d1f1bfc77a 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c index 3f14082930c..ee9a62633c7 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c index 0d62711566b..b633105339d 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c +++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_0); /* Configure the GPIO pins as inputs. */ + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c index 0ae184ed136..f0c484e44a0 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c @@ -78,7 +78,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -90,6 +90,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c index ff48bf16f20..c6a783c45e9 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c @@ -67,13 +67,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c index 18143c76096..fb809ea0c69 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c @@ -67,13 +67,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c index 91e7af7176d..a13337f6a8b 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c @@ -71,13 +71,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c index bba5fab69ec..d50616d7549 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c @@ -68,13 +68,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c index 34a8f090179..2977c57b281 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c @@ -68,13 +68,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c index 748564f1aa7..644f90ca43a 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c index b6c6c08ae8b..56f39ad8df8 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c index 8cd86f73ef7..32f217309c9 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c @@ -68,9 +68,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c index 0eafcfabcbe..5cb7fd2fa83 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c index e7f393e5e51..3cf2697069d 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c @@ -64,9 +64,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return 1; } /**************************************************************************** diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c index ef482f8c570..59712e85cc8 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c index d39851b6c77..c2c0a19561b 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c @@ -66,9 +66,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32_configgpio(GPIO_BTN_USER); + return 1; } /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c index a183eefa158..379d26b2653 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c @@ -65,13 +65,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32_configgpio(GPIO_BTN_USER); + return 1; } /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c index 66bea72931f..d49a2e2533f 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c @@ -68,13 +68,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32l4_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c index 74b09d5d00d..e5f97ea5f88 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c @@ -65,13 +65,14 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure the single button as an input. NOTE that EXTI interrupts are * also configured for the pin. */ stm32l4_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c index 95ea9c16dda..6ad1d2420d6 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c @@ -68,9 +68,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { stm32l4_configgpio(GPIO_BTN_USER); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c index ccc69045d50..0770a1bdf5f 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c @@ -79,7 +79,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { stm32l4_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c index 542c45a172c..62966e4b13c 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c @@ -230,7 +230,7 @@ static int button_pm_prepare(struct pm_callback_s *cb, int domain, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -252,6 +252,8 @@ void board_button_initialize(void) #endif #endif } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c index 083bd050473..8ff121f85d0 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c @@ -229,7 +229,7 @@ static int button_pm_prepare(struct pm_callback_s *cb, int domain, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -251,6 +251,8 @@ void board_button_initialize(void) #endif #endif } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c index 35cd9143e09..550b6f28a57 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c @@ -77,7 +77,7 @@ ****************************************************************************/ #ifdef CONFIG_ARCH_BUTTONS -void board_button_initialize(void) +uint32_t board_button_initialize(void) { uint16_t reg16; @@ -106,6 +106,8 @@ void board_button_initialize(void) reg16 = getreg16(STR71X_GPIO1_PC2); reg16 &= ~STR71X_BUTBUTTON_GPIO1; putreg16(reg16, STR71X_GPIO1_PC2); + + return 2; } /**************************************************************************** diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c index 4397baba24d..cdb013d4a2e 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c @@ -88,7 +88,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -98,6 +98,8 @@ void board_button_initialize(void) { tiva_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c index 4d2c0102d12..1ab05b78c84 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c @@ -70,10 +70,11 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { tiva_configgpio(&g_gpio_sw1); tiva_configgpio(&g_gpio_sw2); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c index 6ff5372c189..a62f99be8a9 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c @@ -70,10 +70,11 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { tiva_configgpio(&g_gpio_sw1); tiva_configgpio(&g_gpio_sw2); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c index 55df8944865..bb789d7321b 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c @@ -78,7 +78,7 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Unlock GPIOF from NMI to use it w/ buttons see Register 19 of GPIOs * and see table 10-10 in datasheet for pins with special considerations. @@ -105,6 +105,7 @@ void board_button_initialize(void) #ifdef CONFIG_ARCH_IRQBUTTONS tiva_gpioirqinitialize(); #endif + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c index 9d0bda6fbbd..bd8b8a6992d 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c @@ -86,7 +86,7 @@ static const uint32_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -102,6 +102,7 @@ void board_button_initialize(void) tiva_gpioirqinitialize(); #endif + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c index a7fa9037463..ed30e15c098 100644 --- a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c +++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c @@ -141,11 +141,12 @@ static int board_button_irqx(gio_pinset_t pinset, int irq, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure button GIOs */ tms570_configgio(GIO_BUTTON); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c index b9bfbe6a529..fa270f0e6f5 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c @@ -141,11 +141,12 @@ static int board_button_irqx(gio_pinset_t pinset, int irq, * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure button GIOs */ tms570_configgio(GIO_BUTTON); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c index 97abb01e138..159785f9469 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c +++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c @@ -50,9 +50,10 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { #warning Missing logic + return 0; } /**************************************************************************** diff --git a/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c b/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c index 4254faefccb..95d251ca56a 100644 --- a/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c +++ b/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c @@ -35,9 +35,10 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { #warning Missing logic + return 0; } /**************************************************************************** diff --git a/boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c b/boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c index a257e2d3454..1b1513c3366 100644 --- a/boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c +++ b/boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c @@ -108,10 +108,11 @@ static int board_button_irqx(int irq, xcpt_t irqhandler, void *arg) * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { at32uc3_configgpio(PINMUX_GPIO_BUTTON1); at32uc3_configgpio(PINMUX_GPIO_BUTTON2); + return 2; } /**************************************************************************** diff --git a/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c index deb28ebbab6..6dc61357ba3 100644 --- a/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c @@ -69,8 +69,9 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { + return 0; } /**************************************************************************** diff --git a/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c index c3086cd661e..add5b16412c 100644 --- a/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c @@ -78,7 +78,7 @@ * Name: board_button_initialize ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { /* Configure all button GPIO lines */ @@ -88,6 +88,8 @@ void board_button_initialize(void) hcs12_configgpio(NE64BADGE_BUTTON2); btn_dumpgpio("board_button_initialize() Exit"); + + return 2; } /**************************************************************************** diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c index d217cb798f8..54f4d1bc0fb 100644 --- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c +++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c @@ -137,7 +137,7 @@ static const uint8_t g_buttoncn[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -151,6 +151,7 @@ void board_button_initialize(void) /* Change AN2/AN3/AN4 to digital */ putreg32(0xffff, PIC32MX_ADC_CFG); + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/mips/pic32mx/ubw32/src/pic32_buttons.c b/boards/mips/pic32mx/ubw32/src/pic32_buttons.c index 4e3b2f5ba16..92e7448b92b 100644 --- a/boards/mips/pic32mx/ubw32/src/pic32_buttons.c +++ b/boards/mips/pic32mx/ubw32/src/pic32_buttons.c @@ -117,7 +117,7 @@ static const uint8_t g_buttoncn[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -127,6 +127,8 @@ void board_button_initialize(void) { pic32mx_configgpio(g_buttonset[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c index 93e08b0da9e..58c13b08aa7 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c +++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c @@ -79,7 +79,7 @@ static const pinset_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -91,6 +91,8 @@ void board_button_initialize(void) { pic32mz_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c index 04113b275ab..1ed823198c7 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c +++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c @@ -87,7 +87,7 @@ static const pinset_t g_buttons[NUM_BUTTONS] = * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { int i; @@ -99,6 +99,8 @@ void board_button_initialize(void) { pic32mz_configgpio(g_buttons[i]); } + + return NUM_BUTTONS; } /**************************************************************************** diff --git a/boards/renesas/m16c/skp16c26/src/m16c_buttons.c b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c index 871bd06b93e..d50ce830853 100644 --- a/boards/renesas/m16c/skp16c26/src/m16c_buttons.c +++ b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c @@ -76,13 +76,15 @@ ****************************************************************************/ #ifdef CONFIG_ARCH_BUTTONS -void board_button_initialize(void) +uint32_t board_button_initialize(void) { uint8_t regval; regval = getreg8(M16C_PD8); regval |= (SW1_BIT | SW2_BIT | SW3_BIT); putreg8(regval, M16C_PD8); + + return 3; } /**************************************************************************** diff --git a/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c b/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c index 71255f53198..5b2db43ffe5 100644 --- a/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c +++ b/boards/risc-v/fe310/hifive1-revb/src/fe310_buttons.c @@ -72,9 +72,10 @@ * ****************************************************************************/ -void board_button_initialize(void) +uint32_t board_button_initialize(void) { fe310_gpio_config(GPIO_BTN); + return 1; } /**************************************************************************** diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c index 282248ada67..fcb62995f50 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c +++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c @@ -105,7 +105,7 @@ void ez80_pb2interrupt(void) ****************************************************************************/ #ifdef CONFIG_ARCH_BUTTONS -void board_button_initialize(void) +uint32_t board_button_initialize(void) { uint8_t regval; @@ -149,6 +149,8 @@ void board_button_initialize(void) regval &= ~7; outp(EZ80_PB_ALT2, regval); #endif + + return 3; } /**************************************************************************** diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 64994c1b9f6..a23790b6f1c 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -447,14 +447,7 @@ config BUTTONS_LOWER 1. The board implementation must provide the button interfaces as defined in include/nuttx/board.h 2. The board implementation must support interrupts for each - button. - 3. The board.h header file must provide the definition - NUM_BUTTONS, and - 4. The board.h header file must not include any other - header files that are not accessible in this context - (such as those in arch//src/) UNLESS those - inclusions are conditioned on __KERNEL__. button_lower.c - will undefine __KERNEL__ before included board.h. + button. If your board does not meet these requirements, then the button_lower.c file can still be copied to your your diff --git a/drivers/input/button_lower.c b/drivers/input/button_lower.c index bebf0284843..06aaff3e424 100644 --- a/drivers/input/button_lower.c +++ b/drivers/input/button_lower.c @@ -48,9 +48,6 @@ #include -#undef __KERNEL__ -#include - #if CONFIG_BUTTONS_LOWER /**************************************************************************** @@ -71,6 +68,8 @@ static int btn_interrupt(int irq, FAR void *context, FAR void *arg); * Private Data ****************************************************************************/ +static uint32_t g_btnnum; + /* This is the button button lower half driver interface */ static const struct btn_lowerhalf_s g_btnlower = @@ -99,8 +98,8 @@ static FAR void *g_btnarg; static btn_buttonset_t btn_supported(FAR const struct btn_lowerhalf_s *lower) { - iinfo("NUM_BUTTONS: %02x\n", NUM_BUTTONS); - return (btn_buttonset_t)((1 << NUM_BUTTONS) - 1); + iinfo("NUM_BUTTONS: %02x\n", g_btnnum); + return (btn_buttonset_t)((1 << g_btnnum) - 1); } /**************************************************************************** @@ -132,7 +131,7 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower, btn_buttonset_t mask; btn_buttonset_t either = press | release; irqstate_t flags; - int id; + uint32_t id; /* Start with all interrupts disabled */ @@ -155,7 +154,7 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower, /* Attach and enable each button interrupt */ - for (id = 0; id < NUM_BUTTONS; id++) + for (id = 0; id < g_btnnum; id++) { mask = (1 << id); if ((either & mask) != 0) @@ -179,12 +178,12 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower, static void btn_disable(void) { irqstate_t flags; - int id; + uint32_t id; /* Disable each button interrupt */ flags = enter_critical_section(); - for (id = 0; id < NUM_BUTTONS; id++) + for (id = 0; id < g_btnnum; id++) { board_button_irq(id, NULL, NULL); } @@ -231,7 +230,7 @@ static int btn_interrupt(int irq, FAR void *context, FAR void *arg) int btn_lower_initialize(FAR const char *devname) { - board_button_initialize(); + g_btnnum = board_button_initialize(); return btn_register(devname, &g_btnlower); } diff --git a/include/nuttx/board.h b/include/nuttx/board.h index 10b933ced97..b25dbe0293a 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -617,11 +617,12 @@ void board_userled_all(uint8_t ledset); * NOTE: This interface may or may not be supported by board-specific * logic. If the board supports button interfaces, then CONFIG_ARCH_BUTTONS * will be defined. + * NOTE: The button number is returned. * ****************************************************************************/ #ifdef CONFIG_ARCH_BUTTONS -void board_button_initialize(void); +uint32_t board_button_initialize(void); #endif /****************************************************************************