Buttons: Change return value of board_buttons() and the type of btn_buttonset_t to uint32_t so that more than 8 buttons can be supported.

This commit is contained in:
Gregory Nutt 2017-04-09 07:22:49 -06:00
parent 5a0636d8bc
commit f9e402018b
77 changed files with 125 additions and 153 deletions

View File

@ -126,9 +126,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t retval;
uint32_t retval;
retval = at32uc3_gpioread(PINMUX_GPIO_BUTTON1) ? 0 : BUTTON1;
retval |= at32uc3_gpioread(PINMUX_GPIO_BUTTON2) ? 0 : BUTTON2;

View File

@ -120,9 +120,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -79,9 +79,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key. A low value will be sensed when the
* button is pressed.

View File

@ -104,9 +104,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -77,7 +77,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return 0;
}

View File

@ -103,9 +103,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -49,18 +49,6 @@
#ifdef CONFIG_ARCH_BUTTONS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
@ -77,7 +65,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return 0;
}

View File

@ -49,18 +49,6 @@
#ifdef CONFIG_ARCH_BUTTONS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
@ -77,7 +65,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return 0;
}

View File

@ -168,7 +168,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return inp(EZ80_PB_DDR) & 7;
}

View File

@ -91,9 +91,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key. A LOW value means that the key is pressed, */

View File

@ -92,9 +92,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
if (kinetis_gpioread(GPIO_SW2))
{

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
if (kinetis_gpioread(GPIO_SW2))
{

View File

@ -79,9 +79,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
bool pinValue;
/* Check that state of each key */

View File

@ -74,7 +74,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
/* The KwikStik-K40 board has no standard GPIO contact buttons */

View File

@ -159,7 +159,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return tms570_gioread(GIO_BUTTON) ? BUTTON_GIOA7_BIT : 0;
}

View File

@ -127,9 +127,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -126,9 +126,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -129,10 +129,10 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
#if 0 /* Not yet implemented */
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -94,9 +94,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
if (hcs12_gpioread(NE64BADGE_BUTTON1))
{

View File

@ -77,7 +77,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return stm32_gpioread(GPIO_BTN_USER) ? 1 : 0;
}

View File

@ -88,7 +88,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
/* Check the state of the USER button. A LOW value means that the key is
* pressed.

View File

@ -78,7 +78,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
/* Check that state of each USER button. A LOW value means that the key is
* pressed.

View File

@ -78,7 +78,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
/* Check that state of each USER button. A LOW value means that the key is
* pressed.

View File

@ -125,9 +125,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret;
uint32_t ret;
int i;
/* Check each button */

View File

@ -130,9 +130,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key */

View File

@ -102,9 +102,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key */

View File

@ -104,9 +104,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key */

View File

@ -112,9 +112,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
if ((getreg16(STR71X_GPIO0_PD) & STR71X_WAKEUPBUTTON_GPIO0) != 0)
{

View File

@ -102,7 +102,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return stm32_gpioread(BUTTON_BOOT0n) ? 0 : BUTTON_BOOT0_MASK;
}

View File

@ -149,9 +149,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -84,7 +84,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
# warning Missing logic
}

View File

@ -66,7 +66,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
/* Check the state of the only button */

View File

@ -105,9 +105,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -133,9 +133,9 @@ void board_button_initialize(void)
*
************************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t retval;
uint32_t retval;
retval = sam_gpioread(GPIO_BUTTON1) ? 0 : BUTTON1;
retval |= sam_gpioread(GPIO_BUTTON2) ? 0 : BUTTON2;

View File

@ -135,9 +135,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t retval;
uint32_t retval;
retval = sam_gpioread(GPIO_SCROLLUP) ? 0 : BUTTON_SCROLLUP;
retval |= sam_gpioread(GPIO_SCROLLDWN) ? 0 : BUTTON_SCROLLDOWN;

View File

@ -53,10 +53,6 @@
#ifdef CONFIG_ARCH_BUTTONS
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
@ -88,7 +84,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_gpioread(GPIO_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -86,7 +86,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_gpioread(GPIO_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -85,7 +85,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_gpioread(GPIO_BP2) ? 0 : BUTTON_BP2_BIT;
}

View File

@ -96,7 +96,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_pioread(PIO_BTN_USER) ? 0 : BUTTON_USER_BIT;
}

View File

@ -100,7 +100,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_pioread(PIO_USER) ? 0 : BUTTON_USER_BIT;
}

View File

@ -100,7 +100,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_pioread(PIO_USER1) ? 0 : BUTTON_USER1_BIT;
}

View File

@ -96,7 +96,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_pioread(PIO_BTN_USER) ? 0 : BUTTON_USER_BIT;
}

View File

@ -85,7 +85,7 @@ void board_button_initialize(void)
*
************************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_portread(PORT_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -85,7 +85,7 @@ void board_button_initialize(void)
*
************************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_portread(PORT_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -147,7 +147,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_gpioread(GPIO_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -85,7 +85,7 @@ void board_button_initialize(void)
*
************************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return sam_portread(PORT_SW0) ? 0 : BUTTON_SW0_BIT;
}

View File

@ -163,9 +163,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t retval;
uint32_t retval;
retval = sam_gpioread(GPIO_SW0) ? 0 : BUTTON_SW0_BIT;
retval |= sam_gpioread(GPIO_SW1) ? 0 : BUTTON_SW1_BIT;

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -89,9 +89,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t swset = 0;
uint32_t swset = 0;
uint8_t regval = getreg8(M16C_P8);
if (SW_PRESSED(regval, SW1_BIT))

View File

@ -80,7 +80,7 @@ void board_button_initialize(void)
* N.B The return state in true logic, the button polarity is dealt here in
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return stm32_gpioread(GPIO_BTN)==0 ? BUTTON_USER_BIT : 0;
}

View File

@ -108,9 +108,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -104,9 +104,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -92,9 +92,9 @@ void board_button_initialize(void)
* Reads keys
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t rv = 0;
uint32_t rv = 0;
int i;
for (i = 0; i != NUM_BUTTONS; ++i)

View File

@ -104,9 +104,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -77,7 +77,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
return stm32_gpioread(GPIO_BTN_USER) ? 1 : 0;
}

View File

@ -103,9 +103,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -261,9 +261,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -75,9 +75,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
ret = (stm32_gpioread(g_buttons[i]) == false ? 1 : 0);

View File

@ -157,9 +157,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int id;
/* Configure input pins */

View File

@ -118,9 +118,9 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
/* Check that state of each key. A LOW value means that the key is
* pressed.

View File

@ -102,9 +102,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -94,9 +94,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
if (kinetis_gpioread(GPIO_SW1))
{

View File

@ -132,9 +132,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int id;
/* Configure input pins */

View File

@ -96,9 +96,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
int i;
/* Check that state of each key */

View File

@ -59,7 +59,7 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
#warning Missing logic
return 0;

View File

@ -109,9 +109,9 @@ void board_button_initialize(void)
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
uint8_t ret = 0;
uint32_t ret = 0;
bool released;
int i;

View File

@ -593,7 +593,7 @@ void board_button_initialize(void);
****************************************************************************/
#ifdef CONFIG_ARCH_BUTTONS
uint8_t board_buttons(void);
uint32_t board_buttons(void);
#endif
/****************************************************************************

View File

@ -96,7 +96,7 @@
* from the button driver.
*/
typedef uint8_t btn_buttonset_t;
typedef uint32_t btn_buttonset_t;
/* A reference to this structure is provided with the BTNIOC_POLLEVENTS IOCTL
* command and describes the conditions under which the client would like

View File

@ -92,7 +92,7 @@
#define PACKETBUF_ATTR_PACKET_TYPE_STREAM_END 3
#define PACKETBUF_ATTR_PACKET_TYPE_TIMESTAMP 4
/* Packet buffer attributes (indices into i_pktattr) */
/* Packet buffer attributes (indices into g_pktattrs) */
#define PACKETBUF_ATTR_NONE 0
@ -130,7 +130,7 @@
#define PACKETBUF_NUM_ATTRS 24
/* Addresses (indices into i_pktaddr) */
/* Addresses (indices into g_pktaddrs) */
#define PACKETBUF_ADDR_SENDER 0
#define PACKETBUF_ADDR_RECEIVER 1