From 1ac245b9c6555ffeb1e34b8bac53c9f5e3ccf3f3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 24 Jan 2014 13:59:24 -0600 Subject: [PATCH] Rename up_buttons() to board_buttons() --- ChangeLog | 2 ++ configs/avr32dev1/src/up_buttons.c | 10 +++++----- configs/cloudctrl/src/up_buttons.c | 14 +++++++------- configs/demo9s12ne64/src/up_buttons.c | 4 ++-- configs/ea3131/src/up_buttons.c | 4 ++-- configs/ea3152/src/up_buttons.c | 4 ++-- configs/ez80f910200zco/src/ez80_buttons.c | 4 ++-- configs/fire-stm32v2/src/up_buttons.c | 14 +++++++------- configs/hymini-stm32v/src/up_buttons.c | 14 +++++++------- configs/kwikstik-k40/src/up_buttons.c | 14 +++++++------- configs/lincoln60/src/up_buttons.c | 12 ++++++------ configs/lpc4330-xplorer/src/up_buttons.c | 12 ++++++------ configs/ne64badge/src/up_buttons.c | 6 +++--- configs/olimex-lpc1766stk/src/up_buttons.c | 12 ++++++------ configs/olimex-stm32-p207/src/up_buttons.c | 14 +++++++------- configs/olimex-strp711/src/up_buttons.c | 4 ++-- configs/open1788/src/lpc17_buttons.c | 10 +++++----- configs/pcduino-a10/src/a1x_buttons.c | 10 +++++----- configs/sam3u-ek/src/up_buttons.c | 10 +++++----- configs/sam4l-xplained/src/sam_buttons.c | 10 +++++----- configs/sam4s-xplained/src/sam_buttons.c | 10 +++++----- configs/sama5d3x-ek/src/sam_buttons.c | 10 +++++----- configs/shenzhou/src/up_buttons.c | 14 +++++++------- configs/skp16c26/src/up_buttons.c | 6 +++--- configs/spark/src/up_buttons.c | 14 +++++++------- configs/stm3210e-eval/src/up_buttons.c | 14 +++++++------- configs/stm3220g-eval/src/up_buttons.c | 14 +++++++------- configs/stm3240g-eval/src/up_buttons.c | 14 +++++++------- configs/stm32f100rc_generic/src/up_buttons.c | 14 +++++++------- configs/stm32f3discovery/src/up_buttons.c | 14 +++++++------- configs/stm32f429i-disco/src/up_buttons.c | 14 +++++++------- configs/stm32f4discovery/src/up_buttons.c | 14 +++++++------- configs/stm32ldiscovery/src/stm32_buttons.c | 14 +++++++------- configs/stm32vldiscovery/src/stm32_buttons.c | 12 ++++++------ configs/sure-pic32mx/src/pic32mx_buttons.c | 12 ++++++------ configs/twr-k60n512/src/up_buttons.c | 14 +++++++------- configs/ubw32/src/up_buttons.c | 14 +++++++------- configs/viewtool-stm32f107/src/stm32_buttons.c | 12 ++++++------ configs/vsn/src/buttons.c | 2 +- configs/zkit-arm-1769/src/up_buttons.c | 18 +++++++++--------- include/nuttx/arch.h | 10 +++++----- 41 files changed, 223 insertions(+), 221 deletions(-) diff --git a/ChangeLog b/ChangeLog index 373c808343..9be2ff96c8 100644 --- a/ChangeLog +++ b/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/configs/avr32dev1/src/up_buttons.c b/configs/avr32dev1/src/up_buttons.c index 40c09b4f32..930ed76ea9 100644 --- a/configs/avr32dev1/src/up_buttons.c +++ b/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/configs/cloudctrl/src/up_buttons.c b/configs/cloudctrl/src/up_buttons.c index dbad073882..06aa884455 100644 --- a/configs/cloudctrl/src/up_buttons.c +++ b/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 @@ -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/configs/demo9s12ne64/src/up_buttons.c b/configs/demo9s12ne64/src/up_buttons.c index bc0d6697b2..107848b102 100644 --- a/configs/demo9s12ne64/src/up_buttons.c +++ b/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/configs/ea3131/src/up_buttons.c b/configs/ea3131/src/up_buttons.c index f5e71b4dcb..1705265907 100644 --- a/configs/ea3131/src/up_buttons.c +++ b/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/configs/ea3152/src/up_buttons.c b/configs/ea3152/src/up_buttons.c index 3a9dcf5446..808118535c 100644 --- a/configs/ea3152/src/up_buttons.c +++ b/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/configs/ez80f910200zco/src/ez80_buttons.c b/configs/ez80f910200zco/src/ez80_buttons.c index 5528a41eb6..61182ac685 100644 --- a/configs/ez80f910200zco/src/ez80_buttons.c +++ b/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/configs/fire-stm32v2/src/up_buttons.c b/configs/fire-stm32v2/src/up_buttons.c index e9ebdc18e5..3c93f66e2e 100644 --- a/configs/fire-stm32v2/src/up_buttons.c +++ b/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 @@ -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/configs/hymini-stm32v/src/up_buttons.c b/configs/hymini-stm32v/src/up_buttons.c index 2ab22227b1..76a44a2e97 100644 --- a/configs/hymini-stm32v/src/up_buttons.c +++ b/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 @@ -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/configs/kwikstik-k40/src/up_buttons.c b/configs/kwikstik-k40/src/up_buttons.c index 0358cda339..d86078d23d 100644 --- a/configs/kwikstik-k40/src/up_buttons.c +++ b/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 @@ -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/configs/lincoln60/src/up_buttons.c b/configs/lincoln60/src/up_buttons.c index 53c9db4e91..d50a9e59a9 100644 --- a/configs/lincoln60/src/up_buttons.c +++ b/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 @@ -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/configs/lpc4330-xplorer/src/up_buttons.c b/configs/lpc4330-xplorer/src/up_buttons.c index a3f4c4975d..d9d4882aaa 100644 --- a/configs/lpc4330-xplorer/src/up_buttons.c +++ b/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 @@ -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/configs/ne64badge/src/up_buttons.c b/configs/ne64badge/src/up_buttons.c index e0daadda00..af72aab8df 100644 --- a/configs/ne64badge/src/up_buttons.c +++ b/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 @@ -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/configs/olimex-lpc1766stk/src/up_buttons.c b/configs/olimex-lpc1766stk/src/up_buttons.c index eaaee6c194..1e296c657d 100644 --- a/configs/olimex-lpc1766stk/src/up_buttons.c +++ b/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 @@ -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/configs/olimex-stm32-p207/src/up_buttons.c b/configs/olimex-stm32-p207/src/up_buttons.c index 789d5da28c..843f80be6a 100644 --- a/configs/olimex-stm32-p207/src/up_buttons.c +++ b/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 @@ -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/configs/olimex-strp711/src/up_buttons.c b/configs/olimex-strp711/src/up_buttons.c index 8047b83614..130904888b 100644 --- a/configs/olimex-strp711/src/up_buttons.c +++ b/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/configs/open1788/src/lpc17_buttons.c b/configs/open1788/src/lpc17_buttons.c index 5982dfb6ab..2aa26e9a03 100644 --- a/configs/open1788/src/lpc17_buttons.c +++ b/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/configs/pcduino-a10/src/a1x_buttons.c b/configs/pcduino-a10/src/a1x_buttons.c index f537e40600..6cae19a93b 100644 --- a/configs/pcduino-a10/src/a1x_buttons.c +++ b/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/configs/sam3u-ek/src/up_buttons.c b/configs/sam3u-ek/src/up_buttons.c index 81b3d7ccbc..ee8c3be0a3 100644 --- a/configs/sam3u-ek/src/up_buttons.c +++ b/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/configs/sam4l-xplained/src/sam_buttons.c b/configs/sam4l-xplained/src/sam_buttons.c index cbf237ef07..450c38a3eb 100644 --- a/configs/sam4l-xplained/src/sam_buttons.c +++ b/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/configs/sam4s-xplained/src/sam_buttons.c b/configs/sam4s-xplained/src/sam_buttons.c index 2db8979cf9..855c2b00f6 100644 --- a/configs/sam4s-xplained/src/sam_buttons.c +++ b/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/configs/sama5d3x-ek/src/sam_buttons.c b/configs/sama5d3x-ek/src/sam_buttons.c index fe74f3fb72..89d4b51bc3 100644 --- a/configs/sama5d3x-ek/src/sam_buttons.c +++ b/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/configs/shenzhou/src/up_buttons.c b/configs/shenzhou/src/up_buttons.c index c9d2e4f1f7..7dffcd2545 100644 --- a/configs/shenzhou/src/up_buttons.c +++ b/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 @@ -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/configs/skp16c26/src/up_buttons.c b/configs/skp16c26/src/up_buttons.c index 219c690ddc..f006589a31 100644 --- a/configs/skp16c26/src/up_buttons.c +++ b/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 @@ -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/configs/spark/src/up_buttons.c b/configs/spark/src/up_buttons.c index ddba1e89e6..410cf052ca 100644 --- a/configs/spark/src/up_buttons.c +++ b/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 @@ -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/configs/stm3210e-eval/src/up_buttons.c b/configs/stm3210e-eval/src/up_buttons.c index 569b380102..efc73eb132 100644 --- a/configs/stm3210e-eval/src/up_buttons.c +++ b/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 @@ -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/configs/stm3220g-eval/src/up_buttons.c b/configs/stm3220g-eval/src/up_buttons.c index e8f19d3f65..3ae268cad3 100644 --- a/configs/stm3220g-eval/src/up_buttons.c +++ b/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 @@ -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/configs/stm3240g-eval/src/up_buttons.c b/configs/stm3240g-eval/src/up_buttons.c index e8c9712dea..3433014afa 100644 --- a/configs/stm3240g-eval/src/up_buttons.c +++ b/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 @@ -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/configs/stm32f100rc_generic/src/up_buttons.c b/configs/stm32f100rc_generic/src/up_buttons.c index 2442e38b4b..0716b4329c 100644 --- a/configs/stm32f100rc_generic/src/up_buttons.c +++ b/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 @@ -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/configs/stm32f3discovery/src/up_buttons.c b/configs/stm32f3discovery/src/up_buttons.c index 305b3251e3..89d225b131 100644 --- a/configs/stm32f3discovery/src/up_buttons.c +++ b/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 @@ -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/configs/stm32f429i-disco/src/up_buttons.c b/configs/stm32f429i-disco/src/up_buttons.c index 6d1b6b8385..2718c0245c 100644 --- a/configs/stm32f429i-disco/src/up_buttons.c +++ b/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 @@ -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/configs/stm32f4discovery/src/up_buttons.c b/configs/stm32f4discovery/src/up_buttons.c index a3f9bd6486..f9983291aa 100644 --- a/configs/stm32f4discovery/src/up_buttons.c +++ b/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 @@ -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/configs/stm32ldiscovery/src/stm32_buttons.c b/configs/stm32ldiscovery/src/stm32_buttons.c index 83833c5e1b..2d2cc88078 100644 --- a/configs/stm32ldiscovery/src/stm32_buttons.c +++ b/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 @@ -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/configs/stm32vldiscovery/src/stm32_buttons.c b/configs/stm32vldiscovery/src/stm32_buttons.c index d214ae323b..56599dba2d 100644 --- a/configs/stm32vldiscovery/src/stm32_buttons.c +++ b/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/configs/sure-pic32mx/src/pic32mx_buttons.c b/configs/sure-pic32mx/src/pic32mx_buttons.c index cfcdbede9e..4d3dddeeb9 100644 --- a/configs/sure-pic32mx/src/pic32mx_buttons.c +++ b/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/configs/twr-k60n512/src/up_buttons.c b/configs/twr-k60n512/src/up_buttons.c index c836efee37..b81d0ea533 100644 --- a/configs/twr-k60n512/src/up_buttons.c +++ b/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 @@ -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/configs/ubw32/src/up_buttons.c b/configs/ubw32/src/up_buttons.c index 5b6bc95644..39c53c4e33 100644 --- a/configs/ubw32/src/up_buttons.c +++ b/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 @@ -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/configs/viewtool-stm32f107/src/stm32_buttons.c b/configs/viewtool-stm32f107/src/stm32_buttons.c index 0c2b623ea9..4e9261f367 100644 --- a/configs/viewtool-stm32f107/src/stm32_buttons.c +++ b/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/configs/vsn/src/buttons.c b/configs/vsn/src/buttons.c index a252606bfe..c8a9b6bac1 100644 --- a/configs/vsn/src/buttons.c +++ b/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/configs/zkit-arm-1769/src/up_buttons.c b/configs/zkit-arm-1769/src/up_buttons.c index d4c5dfd35b..dbfc2e1bbe 100644 --- a/configs/zkit-arm-1769/src/up_buttons.c +++ b/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 * - * 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 @@ -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/include/nuttx/arch.h b/include/nuttx/arch.h index c5011b4774..42beee5591 100644 --- a/include/nuttx/arch.h +++ b/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 /****************************************************************************