Merge remote-tracking branch 'origin/master' into ieee802154

This commit is contained in:
Gregory Nutt
2017-04-09 10:16:57 -06:00
79 changed files with 180 additions and 181 deletions
+2 -2
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;
+2 -2
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 */
+2 -2
View File
@@ -80,9 +80,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.
+2 -2
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 */
+1 -1
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;
}
+2 -2
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 */
+1 -13
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;
}
+1 -13
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;
}
+1 -1
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;
}
+2 -2
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, */
+2 -2
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))
{
+2 -2
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))
{
+2 -2
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 */
+1 -1
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 */
@@ -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;
}
+2 -2
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 */
+2 -2
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 */
+2 -2
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 */
+2 -2
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))
{
+1 -1
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;
}
+1 -1
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.
+1 -1
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.
+1 -1
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.
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
+2 -2
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)
{
+1 -1
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;
}
+2 -2
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 */
+1 -1
View File
@@ -84,7 +84,7 @@ void board_button_initialize(void)
*
****************************************************************************/
uint8_t board_buttons(void)
uint32_t board_buttons(void)
{
# warning Missing logic
}
+28 -7
View File
@@ -90,6 +90,7 @@ CONFIG_ARCH="arm"
# CONFIG_ARCH_CHIP_LPC2378 is not set
# CONFIG_ARCH_CHIP_LPC31XX is not set
# CONFIG_ARCH_CHIP_LPC43XX is not set
# CONFIG_ARCH_CHIP_MOXART is not set
# CONFIG_ARCH_CHIP_NUC1XX is not set
# CONFIG_ARCH_CHIP_SAMA5 is not set
# CONFIG_ARCH_CHIP_SAMD is not set
@@ -101,7 +102,7 @@ CONFIG_ARCH_CHIP_STM32=y
# CONFIG_ARCH_CHIP_STM32L4 is not set
# CONFIG_ARCH_CHIP_STR71X is not set
# CONFIG_ARCH_CHIP_TMS570 is not set
# CONFIG_ARCH_CHIP_MOXART is not set
# CONFIG_ARCH_CHIP_XMC4 is not set
# CONFIG_ARCH_ARM7TDMI is not set
# CONFIG_ARCH_ARM926EJS is not set
# CONFIG_ARCH_ARM920T is not set
@@ -371,9 +372,13 @@ CONFIG_STM32_HAVE_ADC3=y
# CONFIG_STM32_HAVE_SDADC3_DMA is not set
CONFIG_STM32_HAVE_CAN1=y
CONFIG_STM32_HAVE_CAN2=y
# CONFIG_STM32_HAVE_COMP1 is not set
# CONFIG_STM32_HAVE_COMP2 is not set
# CONFIG_STM32_HAVE_COMP3 is not set
# CONFIG_STM32_HAVE_COMP4 is not set
# CONFIG_STM32_HAVE_COMP5 is not set
# CONFIG_STM32_HAVE_COMP6 is not set
# CONFIG_STM32_HAVE_COMP7 is not set
CONFIG_STM32_HAVE_DAC1=y
CONFIG_STM32_HAVE_DAC2=y
CONFIG_STM32_HAVE_RNG=y
@@ -387,7 +392,10 @@ CONFIG_STM32_HAVE_SPI3=y
# CONFIG_STM32_HAVE_SPI6 is not set
# CONFIG_STM32_HAVE_SAIPLL is not set
# CONFIG_STM32_HAVE_I2SPLL is not set
# CONFIG_STM32_HAVE_OPAMP is not set
# CONFIG_STM32_HAVE_OPAMP1 is not set
# CONFIG_STM32_HAVE_OPAMP2 is not set
# CONFIG_STM32_HAVE_OPAMP3 is not set
# CONFIG_STM32_HAVE_OPAMP4 is not set
# CONFIG_STM32_ADC1 is not set
# CONFIG_STM32_ADC2 is not set
# CONFIG_STM32_ADC3 is not set
@@ -401,6 +409,7 @@ CONFIG_STM32_HAVE_SPI3=y
# CONFIG_STM32_I2C1 is not set
# CONFIG_STM32_I2C2 is not set
# CONFIG_STM32_I2C3 is not set
# CONFIG_STM32_OPAMP is not set
# CONFIG_STM32_OTGFS is not set
# CONFIG_STM32_OTGHS is not set
# CONFIG_STM32_PWR is not set
@@ -436,6 +445,7 @@ CONFIG_STM32_IWDG=y
#
# Alternate Pin Mapping
#
# CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW is not set
# CONFIG_STM32_JTAG_DISABLE is not set
# CONFIG_STM32_JTAG_FULL_ENABLE is not set
# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
@@ -569,6 +579,11 @@ CONFIG_ARCH_BOARD="photon"
#
# Common Board Options
#
CONFIG_ARCH_HAVE_LEDS=y
# CONFIG_ARCH_LEDS is not set
CONFIG_ARCH_HAVE_BUTTONS=y
# CONFIG_ARCH_BUTTONS is not set
CONFIG_ARCH_HAVE_IRQBUTTONS=y
#
# Board-Specific Options
@@ -638,6 +653,8 @@ CONFIG_SCHED_WAITPID=y
#
# CONFIG_PTHREAD_MUTEX_TYPES is not set
CONFIG_PTHREAD_MUTEX_ROBUST=y
# CONFIG_PTHREAD_MUTEX_UNSAFE is not set
# CONFIG_PTHREAD_MUTEX_BOTH is not set
CONFIG_NPTHREAD_KEYS=4
# CONFIG_PTHREAD_CLEANUP is not set
# CONFIG_CANCELLATION_POINTS is not set
@@ -755,6 +772,7 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
#
# LED Support
#
# CONFIG_USERLED is not set
# CONFIG_RGBLED is not set
# CONFIG_PCA9635PW is not set
# CONFIG_NCP5623C is not set
@@ -818,6 +836,7 @@ CONFIG_USART1_2STOP=0
# CONFIG_PSEUDOTERM is not set
# CONFIG_USBDEV is not set
# CONFIG_USBHOST is not set
# CONFIG_USBMISC is not set
# CONFIG_HAVE_USBTRACE is not set
# CONFIG_DRIVERS_WIRELESS is not set
# CONFIG_DRIVERS_CONTACTLESS is not set
@@ -1042,10 +1061,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
# Application Configuration
#
#
# NxWidgets/NxWM
#
#
# Built-In Applications
#
@@ -1058,6 +1073,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
#
# Examples
#
# CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CCTYPE is not set
# CONFIG_EXAMPLES_CHAT is not set
# CONFIG_EXAMPLES_CONFIGDATA is not set
@@ -1072,6 +1088,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_IGMP is not set
# CONFIG_EXAMPLES_JSON is not set
# CONFIG_EXAMPLES_KEYPADTEST is not set
# CONFIG_EXAMPLES_LEDS is not set
# CONFIG_EXAMPLES_MEDIA is not set
# CONFIG_EXAMPLES_MM is not set
# CONFIG_EXAMPLES_MODBUS is not set
@@ -1106,9 +1123,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_TIFF is not set
# CONFIG_EXAMPLES_TOUCHSCREEN is not set
# CONFIG_EXAMPLES_USBSERIAL is not set
# CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set
# CONFIG_EXAMPLES_WEBSERVER is not set
# CONFIG_EXAMPLES_XBC_TEST is not set
#
# File System Utilities
@@ -1249,6 +1266,10 @@ CONFIG_NSH_ARCHINIT=y
# CONFIG_NSH_LOGIN is not set
# CONFIG_NSH_CONSOLE_LOGIN is not set
#
# NxWidgets/NxWM
#
#
# Platform-specific Support
#
+1 -1
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 */
@@ -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 */
+2 -2
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;
+2 -2
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;
+1 -5
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}
+1 -1
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;
}

Some files were not shown because too many files have changed in this diff Show More