drivers/button: Let board_button_initialize return the button number

so the lower half driver don't need include the specific board.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I2ff5c30049a5c5e8ee90baea56e9f4cb1a8a4f87

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
 }

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
 }

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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
 }
 

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /*****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************

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;
 }
 
 /****************************************************************************