Rename up_buttons() to board_buttons()

42 files changed, 226 insertions, 224 deletions

diff --git a/apps/examples/buttons/buttons_main.c b/apps/examples/buttons/buttons_main.c
index fba88d026..130ec2181 100644
--- a/apps/examples/buttons/buttons_main.c
+++ b/apps/examples/buttons/buttons_main.c
@@ -312,7 +312,7 @@ static void show_buttons(uint8_t oldset, uint8_t newset)
 #ifdef CONFIG_ARCH_IRQBUTTONS
 static void button_handler(int id, int irq)
 {
-  uint8_t newset = up_buttons();
+  uint8_t newset = board_buttons();
 
   lowsyslog("IRQ:%d Button %d:%s SET:%02x:\n",
             irq, id, g_buttoninfo[BUTTON_INDEX(id)].name, newset);
@@ -448,7 +448,7 @@ int buttons_main(int argc, char *argv[])
 
   /* Poll button state */
 
-  g_oldset = up_buttons();
+  g_oldset = board_buttons();
 #ifdef CONFIG_NSH_BUILTIN_APPS
   while (g_nbuttons < maxbuttons)
 #else
@@ -457,7 +457,7 @@ int buttons_main(int argc, char *argv[])
     {
       /* Get the set of pressed and release buttons. */
 
-      newset = up_buttons();
+      newset = board_buttons();
 
       /* Any changes from the last sample? */
 
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 373c80834..9be2ff96c 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6512,4 +6512,6 @@
 	* Many files: renamed up_buttoninit() to board_button_initialize to
 	  better conform to the naming standard.  Now ONLY prototypes in
 	  include/nuttx/arch.h (2014-1024).
+	* Rename up_buttons() to board_buttons() for the same reason (2014-
+	  1-14).
 
diff --git a/nuttx/configs/avr32dev1/src/up_buttons.c b/nuttx/configs/avr32dev1/src/up_buttons.c
index 40c09b4f3..930ed76ea 100644
--- a/nuttx/configs/avr32dev1/src/up_buttons.c
+++ b/nuttx/configs/avr32dev1/src/up_buttons.c
@@ -110,7 +110,7 @@ static xcpt_t up_irqbuttonx(int irq, xcpt_t irqhandler)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After  that, up_buttons() may be called to collect the current state of
+ *   After  that, board_buttons() may be called to collect the current state of
  *   all  buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -123,18 +123,18 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions in the board.h header file for the meaning of each bit in
  *   the returned value.
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t retval;
 
diff --git a/nuttx/configs/cloudctrl/src/up_buttons.c b/nuttx/configs/cloudctrl/src/up_buttons.c
index dbad07388..06aa88445 100644
--- a/nuttx/configs/cloudctrl/src/up_buttons.c
+++ b/nuttx/configs/cloudctrl/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/cloudctrl/src/up_buttons.c
+ * configs/cloudctrl/src/board_buttons.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After  that, up_buttons() may be called to collect the current state of
+ *   After  that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -137,12 +137,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After  that, up_buttons() may be called to collect the current state of
+ *   After  that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to  collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to  collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
diff --git a/nuttx/configs/demo9s12ne64/src/up_buttons.c b/nuttx/configs/demo9s12ne64/src/up_buttons.c
index bc0d6697b..107848b10 100644
--- a/nuttx/configs/demo9s12ne64/src/up_buttons.c
+++ b/nuttx/configs/demo9s12ne64/src/up_buttons.c
@@ -73,10 +73,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return 0;
 }
diff --git a/nuttx/configs/ea3131/src/up_buttons.c b/nuttx/configs/ea3131/src/up_buttons.c
index f5e71b4dc..170526590 100644
--- a/nuttx/configs/ea3131/src/up_buttons.c
+++ b/nuttx/configs/ea3131/src/up_buttons.c
@@ -73,10 +73,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return 0;
 }
diff --git a/nuttx/configs/ea3152/src/up_buttons.c b/nuttx/configs/ea3152/src/up_buttons.c
index 3a9dcf544..808118535 100644
--- a/nuttx/configs/ea3152/src/up_buttons.c
+++ b/nuttx/configs/ea3152/src/up_buttons.c
@@ -73,10 +73,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return 0;
 }
diff --git a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c
index 5528a41eb..61182ac68 100644
--- a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c
+++ b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c
@@ -164,10 +164,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return inp(EZ80_PB_DDR) & 7;
 }
diff --git a/nuttx/configs/fire-stm32v2/src/up_buttons.c b/nuttx/configs/fire-stm32v2/src/up_buttons.c
index e9ebdc18e..3c93f66e2 100644
--- a/nuttx/configs/fire-stm32v2/src/up_buttons.c
+++ b/nuttx/configs/fire-stm32v2/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/fire-stm32v2/src/up_buttons.c
+ * configs/fire-stm32v2/src/board_buttons.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,7 +69,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -86,10 +86,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
@@ -113,12 +113,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of all
+ *   After that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
diff --git a/nuttx/configs/hymini-stm32v/src/up_buttons.c b/nuttx/configs/hymini-stm32v/src/up_buttons.c
index 2ab22227b..76a44a2e9 100644
--- a/nuttx/configs/hymini-stm32v/src/up_buttons.c
+++ b/nuttx/configs/hymini-stm32v/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/hymini-stm32v/src/up_buttons.c
+ * configs/hymini-stm32v/src/board_buttons.c
  *
  *   Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -61,7 +61,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -74,10 +74,10 @@ void board_button_initialize(void)
   }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
   {
     uint8_t ret = 0;
     bool pinValue;
@@ -107,12 +107,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *  of each bit.
diff --git a/nuttx/configs/kwikstik-k40/src/up_buttons.c b/nuttx/configs/kwikstik-k40/src/up_buttons.c
index 0358cda33..d86078d23 100644
--- a/nuttx/configs/kwikstik-k40/src/up_buttons.c
+++ b/nuttx/configs/kwikstik-k40/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/kwikstik-k40/src/up_buttons.c
+ * configs/kwikstik-k40/src/board_buttons.c
  *
  *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,7 +69,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -81,10 +81,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   /* The KwikStik-K40 board has no standard GPIO contact buttons */
 
@@ -96,12 +96,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
diff --git a/nuttx/configs/lincoln60/src/up_buttons.c b/nuttx/configs/lincoln60/src/up_buttons.c
index 53c9db4e9..d50a9e59a 100644
--- a/nuttx/configs/lincoln60/src/up_buttons.c
+++ b/nuttx/configs/lincoln60/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lincoln60/src/up_buttons.c
+ * configs/lincoln60/src/board_buttons.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -98,7 +98,7 @@ static uint8_t g_buttonirq[BOARD_NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -117,14 +117,14 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons.
  *
- *   up_buttons() may be called at any time to harvest the state of every
+ *   board_buttons() may be called at any time to harvest the state of every
  *   button.  The state of the buttons is returned as a bitset with one
  *   bit corresponding to each button:  If the bit is set, then the button
  *   is pressed.  See the BOARD_BUTTON_*_BIT and BOARD_JOYSTICK_*_BIT
@@ -132,7 +132,7 @@ void board_button_initialize(void)
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
diff --git a/nuttx/configs/lpc4330-xplorer/src/up_buttons.c b/nuttx/configs/lpc4330-xplorer/src/up_buttons.c
index a3f4c4975..d9d4882aa 100644
--- a/nuttx/configs/lpc4330-xplorer/src/up_buttons.c
+++ b/nuttx/configs/lpc4330-xplorer/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lpc4330-xplorer/src/up_buttons.c
+ * configs/lpc4330-xplorer/src/board_buttons.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -97,7 +97,7 @@ static uint8_t g_buttonirq[BOARD_NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -116,14 +116,14 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons.
  *
- *   up_buttons() may be called at any time to harvest the state of every
+ *   board_buttons() may be called at any time to harvest the state of every
  *   button.  The state of the buttons is returned as a bitset with one
  *   bit corresponding to each button:  If the bit is set, then the button
  *   is pressed.  See the BOARD_BUTTON_*_BIT and BOARD_JOYSTICK_*_BIT
@@ -131,7 +131,7 @@ void board_button_initialize(void)
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
diff --git a/nuttx/configs/ne64badge/src/up_buttons.c b/nuttx/configs/ne64badge/src/up_buttons.c
index e0daadda0..af72aab8d 100644
--- a/nuttx/configs/ne64badge/src/up_buttons.c
+++ b/nuttx/configs/ne64badge/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ne64badge/src/up_buttons.c
+ * configs/ne64badge/src/board_buttons.c
  *
  *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -109,10 +109,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret    = 0;
 
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c b/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c
index eaaee6c19..1e296c657 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-lpc1766stk/src/up_buttons.c
+ * configs/olimex-lpc1766stk/src/board_buttons.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -101,7 +101,7 @@ static uint8_t g_buttonirq[BOARD_NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -120,14 +120,14 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons.
  *
- *   up_buttons() may be called at any time to harvest the state of every
+ *   board_buttons() may be called at any time to harvest the state of every
  *   button.  The state of the buttons is returned as a bitset with one
  *   bit corresponding to each button:  If the bit is set, then the button
  *   is pressed.  See the BOARD_BUTTON_*_BIT and BOARD_JOYSTICK_*_BIT
@@ -135,7 +135,7 @@ void board_button_initialize(void)
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c b/nuttx/configs/olimex-stm32-p207/src/up_buttons.c
index 789d5da28..843f80be6 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c
+++ b/nuttx/configs/olimex-stm32-p207/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-stm32-p207/src/up_buttons.c
+ * configs/olimex-stm32-p207/src/board_buttons.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -84,7 +84,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -105,10 +105,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
@@ -157,12 +157,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/olimex-strp711/src/up_buttons.c b/nuttx/configs/olimex-strp711/src/up_buttons.c
index 8047b8361..130904888 100644
--- a/nuttx/configs/olimex-strp711/src/up_buttons.c
+++ b/nuttx/configs/olimex-strp711/src/up_buttons.c
@@ -108,10 +108,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret    = 0;
 
diff --git a/nuttx/configs/open1788/src/lpc17_buttons.c b/nuttx/configs/open1788/src/lpc17_buttons.c
index 5982dfb6a..2aa26e9a0 100644
--- a/nuttx/configs/open1788/src/lpc17_buttons.c
+++ b/nuttx/configs/open1788/src/lpc17_buttons.c
@@ -119,7 +119,7 @@ static uint8_t g_buttonirq[BOARD_NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -138,14 +138,14 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons.
  *
- *   up_buttons() may be called at any time to harvest the state of every
+ *   board_buttons() may be called at any time to harvest the state of every
  *   button.  The state of the buttons is returned as a bitset with one
  *   bit corresponding to each button:  If the bit is set, then the button
  *   is pressed.  See the BOARD_BUTTON_*_BIT and BOARD_JOYSTICK_*_BIT
@@ -153,7 +153,7 @@ void board_button_initialize(void)
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
diff --git a/nuttx/configs/pcduino-a10/src/a1x_buttons.c b/nuttx/configs/pcduino-a10/src/a1x_buttons.c
index f537e4060..6cae19a93 100644
--- a/nuttx/configs/pcduino-a10/src/a1x_buttons.c
+++ b/nuttx/configs/pcduino-a10/src/a1x_buttons.c
@@ -76,7 +76,7 @@ static xcpt_t g_irqbutton[BOARD_NBUTTONS];
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -88,17 +88,17 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON* definitions
  *   above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
 # warning Missing logic
 }
diff --git a/nuttx/configs/sam3u-ek/src/up_buttons.c b/nuttx/configs/sam3u-ek/src/up_buttons.c
index 81b3d7ccb..ee8c3be0a 100644
--- a/nuttx/configs/sam3u-ek/src/up_buttons.c
+++ b/nuttx/configs/sam3u-ek/src/up_buttons.c
@@ -116,7 +116,7 @@ static xcpt_t up_irqbuttonx(int irq, xcpt_t irqhandler, xcpt_t *store)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -129,17 +129,17 @@ void board_button_initialize(void)
 }
 
 /************************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be called to collect
- *   the state of all buttons.  up_buttons() returns an 8-bit bit set with each bit
+ *   After board_button_initialize() has been called, board_buttons() may be called to collect
+ *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
  ************************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t retval;
 
diff --git a/nuttx/configs/sam4l-xplained/src/sam_buttons.c b/nuttx/configs/sam4l-xplained/src/sam_buttons.c
index cbf237ef0..450c38a3e 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_buttons.c
+++ b/nuttx/configs/sam4l-xplained/src/sam_buttons.c
@@ -77,7 +77,7 @@ static xcpt_t g_irqsw0;
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -89,17 +89,17 @@ void board_button_initialize(void)
 }
 
 /************************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be called to collect
- *   the state of all buttons.  up_buttons() returns an 8-bit bit set with each bit
+ *   After board_button_initialize() has been called, board_buttons() may be called to collect
+ *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
  ************************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return sam_gpioread(GPIO_SW0) ? 0 : BUTTON_SW0_BIT;
 }
diff --git a/nuttx/configs/sam4s-xplained/src/sam_buttons.c b/nuttx/configs/sam4s-xplained/src/sam_buttons.c
index 2db8979cf..855c2b00f 100644
--- a/nuttx/configs/sam4s-xplained/src/sam_buttons.c
+++ b/nuttx/configs/sam4s-xplained/src/sam_buttons.c
@@ -75,7 +75,7 @@ static xcpt_t g_irqbp2;
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -87,17 +87,17 @@ void board_button_initialize(void)
 }
 
 /************************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be called to collect
- *   the state of all buttons.  up_buttons() returns an 8-bit bit set with each bit
+ *   After board_button_initialize() has been called, board_buttons() may be called to collect
+ *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
  ************************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return sam_gpioread(GPIO_BP2) ? 0 : BUTTON_BP2_BIT;
 }
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_buttons.c b/nuttx/configs/sama5d3x-ek/src/sam_buttons.c
index fe74f3fb7..89d4b51bc 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_buttons.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_buttons.c
@@ -92,7 +92,7 @@ static xcpt_t g_irquser1;
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -104,17 +104,17 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON* definitions
  *   above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return sam_pioread(PIO_USER1) ? 0 : BUTTON_USER1_BIT;
 }
diff --git a/nuttx/configs/shenzhou/src/up_buttons.c b/nuttx/configs/shenzhou/src/up_buttons.c
index c9d2e4f1f..7dffcd254 100644
--- a/nuttx/configs/shenzhou/src/up_buttons.c
+++ b/nuttx/configs/shenzhou/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_buttons.c
+ * configs/shenzhou/src/board_buttons.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -77,7 +77,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -98,10 +98,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -136,12 +136,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/skp16c26/src/up_buttons.c b/nuttx/configs/skp16c26/src/up_buttons.c
index 219c690dd..f006589a3 100644
--- a/nuttx/configs/skp16c26/src/up_buttons.c
+++ b/nuttx/configs/skp16c26/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/skp16c26/src/up_buttons.c
+ * configs/skp16c26/src/board_buttons.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -83,10 +83,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t swset  = 0;
   uint8_t regval = getreg8(M16C_P8);
diff --git a/nuttx/configs/spark/src/up_buttons.c b/nuttx/configs/spark/src/up_buttons.c
index ddba1e89e..410cf052c 100644
--- a/nuttx/configs/spark/src/up_buttons.c
+++ b/nuttx/configs/spark/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/spark/src/up_buttons.c
+ * configs/spark/src/board_buttons.c
  *
  *   Copyright (C) 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,7 +69,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -85,12 +85,12 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * N.B The return state in true logic, the button polarity is dealt here in
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return stm32_gpioread(GPIO_BTN)==0 ? BUTTON_USER_BIT : 0;
 }
@@ -100,12 +100,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm3210e-eval/src/up_buttons.c b/nuttx/configs/stm3210e-eval/src/up_buttons.c
index 569b38010..efc73eb13 100644
--- a/nuttx/configs/stm3210e-eval/src/up_buttons.c
+++ b/nuttx/configs/stm3210e-eval/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_buttons.c
+ * configs/stm3210e-eval/src/board_buttons.c
  *
  *   Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -137,12 +137,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm3220g-eval/src/up_buttons.c b/nuttx/configs/stm3220g-eval/src/up_buttons.c
index e8f19d3f6..3ae268cad 100644
--- a/nuttx/configs/stm3220g-eval/src/up_buttons.c
+++ b/nuttx/configs/stm3220g-eval/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3220g-eval/src/up_buttons.c
+ * configs/stm3220g-eval/src/board_buttons.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -137,12 +137,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm3240g-eval/src/up_buttons.c b/nuttx/configs/stm3240g-eval/src/up_buttons.c
index e8c9712de..3433014af 100644
--- a/nuttx/configs/stm3240g-eval/src/up_buttons.c
+++ b/nuttx/configs/stm3240g-eval/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3240g-eval/src/up_buttons.c
+ * configs/stm3240g-eval/src/board_buttons.c
  *
  *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -137,12 +137,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32f100rc_generic/src/up_buttons.c b/nuttx/configs/stm32f100rc_generic/src/up_buttons.c
index 2442e38b4..0716b4329 100644
--- a/nuttx/configs/stm32f100rc_generic/src/up_buttons.c
+++ b/nuttx/configs/stm32f100rc_generic/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f100rc_generic/src/up_buttons.c
+ * configs/stm32f100rc_generic/src/board_buttons.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -58,7 +58,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -70,10 +70,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
@@ -87,12 +87,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32f3discovery/src/up_buttons.c b/nuttx/configs/stm32f3discovery/src/up_buttons.c
index 305b3251e..89d225b13 100644
--- a/nuttx/configs/stm32f3discovery/src/up_buttons.c
+++ b/nuttx/configs/stm32f3discovery/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f3discovery/src/up_buttons.c
+ * configs/stm32f3discovery/src/board_buttons.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -132,12 +132,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32f429i-disco/src/up_buttons.c b/nuttx/configs/stm32f429i-disco/src/up_buttons.c
index 6d1b6b838..2718c0245 100644
--- a/nuttx/configs/stm32f429i-disco/src/up_buttons.c
+++ b/nuttx/configs/stm32f429i-disco/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f429i-disco/src/up_buttons.c
+ * configs/stm32f429i-disco/src/board_buttons.c
  *
  *   Copyright (C) 2011-2012, 2-14 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -132,12 +132,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32f4discovery/src/up_buttons.c b/nuttx/configs/stm32f4discovery/src/up_buttons.c
index a3f9bd648..f9983291a 100644
--- a/nuttx/configs/stm32f4discovery/src/up_buttons.c
+++ b/nuttx/configs/stm32f4discovery/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f4discovery/src/up_buttons.c
+ * configs/stm32f4discovery/src/board_buttons.c
  *
  *   Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -132,12 +132,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c
index 83833c5e1..2d2cc8807 100644
--- a/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c
+++ b/nuttx/configs/stm32ldiscovery/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32ldiscovery/src/up_buttons.c
+ * configs/stm32ldiscovery/src/board_buttons.c
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -78,7 +78,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -99,10 +99,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -132,12 +132,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c b/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c
index d214ae323..56599dba2 100644
--- a/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c
+++ b/nuttx/configs/stm32vldiscovery/src/stm32_buttons.c
@@ -58,7 +58,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -70,10 +70,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
@@ -87,12 +87,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c
index cfcdbede9..4d3dddeeb 100644
--- a/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c
+++ b/nuttx/configs/sure-pic32mx/src/pic32mx_buttons.c
@@ -129,7 +129,7 @@ static const uint8_t g_buttoncn[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -152,10 +152,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int id;
@@ -178,12 +178,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/twr-k60n512/src/up_buttons.c b/nuttx/configs/twr-k60n512/src/up_buttons.c
index c836efee3..b81d0ea53 100644
--- a/nuttx/configs/twr-k60n512/src/up_buttons.c
+++ b/nuttx/configs/twr-k60n512/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/twr-k60n512/src/up_buttons.c
+ * configs/twr-k60n512/src/board_buttons.c
  *
  *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -74,7 +74,7 @@
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -89,10 +89,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
@@ -114,12 +114,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/ubw32/src/up_buttons.c b/nuttx/configs/ubw32/src/up_buttons.c
index 5b6bc9564..39c53c4e3 100644
--- a/nuttx/configs/ubw32/src/up_buttons.c
+++ b/nuttx/configs/ubw32/src/up_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ubw32/src/up_buttons.c
+ * configs/ubw32/src/board_buttons.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -108,7 +108,7 @@ static const uint8_t g_buttoncn[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -127,10 +127,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int id;
@@ -153,12 +153,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT  definitions in
  *   board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c
index 0c2b623ea..4e9261f36 100644
--- a/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c
+++ b/nuttx/configs/viewtool-stm32f107/src/stm32_buttons.c
@@ -77,7 +77,7 @@ static const uint16_t g_buttons[NUM_BUTTONS] =
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -98,10 +98,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   int i;
@@ -132,12 +132,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/configs/vsn/src/buttons.c b/nuttx/configs/vsn/src/buttons.c
index a252606bf..c8a9b6bac 100644
--- a/nuttx/configs/vsn/src/buttons.c
+++ b/nuttx/configs/vsn/src/buttons.c
@@ -82,7 +82,7 @@ void board_button_initialize(void)
 }
 
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   return stm32_gpioread(GPIO_PUSHBUTTON);
 }
diff --git a/nuttx/configs/zkit-arm-1769/src/up_buttons.c b/nuttx/configs/zkit-arm-1769/src/up_buttons.c
index d4c5dfd35..dbfc2e1bb 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_buttons.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_buttons.c
@@ -1,11 +1,11 @@
 /****************************************************************************
- * configs/zkit-arm-1769/src/up_buttons.c
- *  arch/arm/src/board/up_buttons.c
+ * configs/zkit-arm-1769/src/board_buttons.c
+ *  arch/arm/src/board/board_buttons.c
  *
  *   Copyright (C)  2011 Zilogic Systems. All rights reserved.
  *   Author: Kannan <code@zilogic.com>
  *
- * Based on configs/stm3210e-eval/src/up_buttons.c
+ * Based on configs/stm3210e-eval/src/board_buttons.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -87,7 +87,7 @@ static xcpt_t g_oldhandler;
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -108,10 +108,10 @@ void board_button_initialize(void)
 }
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  ****************************************************************************/
 
-uint8_t up_buttons(void)
+uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
   bool released;
@@ -139,12 +139,12 @@ uint8_t up_buttons(void)
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.  After
- *   that, up_buttons() may be called to collect the current state of all
+ *   that, board_buttons() may be called to collect the current state of all
  *   buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
- *   After board_button_initialize() has been called, up_buttons() may be called to
- *   collect the state of all buttons.  up_buttons() returns an 8-bit bit set
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h
index c5011b477..42beee559 100644
--- a/nuttx/include/nuttx/arch.h
+++ b/nuttx/include/nuttx/arch.h
@@ -1019,7 +1019,7 @@ ssize_t up_check_stack_remain(void);
  *
  * Description:
  *   board_button_initialize() must be called to initialize button resources.
- *   After that, up_buttons() may be called to collect the current state of
+ *   After that, board_buttons() may be called to collect the current state of
  *   all buttons or up_irqbutton() may be called to register button interrupt
  *   handlers.
  *
@@ -1034,11 +1034,11 @@ void board_button_initialize(void);
 #endif
 
 /****************************************************************************
- * Name: up_buttons
+ * Name: board_buttons
  *
  * Description:
- *   After board_button_initialize() has been called, up_buttons() may be
- *   called to collect the state of all buttons.  up_buttons() returns an
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
  *   8-bit bit set with each bit associated with a button.  A bit set to
  *   "1" means that the button is depressed; a bit set to "0" means that
  *   the button is released.  The correspondence of the each button bit
@@ -1051,7 +1051,7 @@ void board_button_initialize(void);
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_BUTTONS
-uint8_t up_buttons(void);
+uint8_t board_buttons(void);
 #endif
 
 /****************************************************************************