sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged nuttx/nuttx into master

Browse Source
This commit is contained in:
Simon Piriou 2017-03-12 00:03:06 +01:00
commit dad34d02e2
14 changed files with 295 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/common/up_initialize.c
View File

@ -100,13 +100,13 @@ static void up_calibratedelay(void)
*
****************************************************************************/
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 7
static inline void up_color_intstack(void)
{
uint32_t *ptr = (uint32_t *)&g_intstackalloc;
ssize_t size;
for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~7);
size > 0;
size -= sizeof(uint32_t))
{

8
arch/arm/src/stm32/stm32f20xxx_rcc.c
View File

@ -195,8 +195,16 @@ static inline void rcc_enableahb1(void)
#ifdef CONFIG_STM32_OTGHS
/* USB OTG HS */
#ifndef BOARD_DISABLE_USBOTG_HSULPI
/* Enable clocking for USB OTG HS and external PHY */
regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
#else
/* Enable only clocking for USB OTG HS */
regval |= (RCC_AHB1ENR_OTGHSEN);
#endif
#endif /* CONFIG_STM32_OTGHS */
putreg32(regval, STM32_RCC_AHB1ENR); /* Enable peripherals */
}

9
arch/arm/src/stm32/stm32f40xxx_rcc.c
View File

@ -215,10 +215,15 @@ static inline void rcc_enableahb1(void)
#endif
#ifdef CONFIG_STM32_OTGHS
/* USB OTG HS */
#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
/* Enable clocking for USB OTG HS and external PHY */
regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
#else
/* Enable only clocking for USB OTG HS */
regval |= RCC_AHB1ENR_OTGHSEN;
#endif
#endif /* CONFIG_STM32_OTGHS */
#ifdef CONFIG_STM32_DMA2D

9
arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
View File

@ -225,10 +225,15 @@ static inline void rcc_enableahb1(void)
#endif
#ifdef CONFIG_STM32F7_OTGHS
/* USB OTG HS */
#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
/* Enable clocking for USB OTG HS and external PHY */
regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
#else
/* Enable only clocking for USB OTG HS */
regval |= RCC_AHB1ENR_OTGHSEN;
#endif
#endif /* CONFIG_STM32F7_OTGHS */
putreg32(regval, STM32_RCC_AHB1ENR); /* Enable peripherals */

9
arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
View File

@ -221,10 +221,15 @@ static inline void rcc_enableahb1(void)
#endif
#ifdef CONFIG_STM32F7_OTGHS
/* USB OTG HS */
#if 0 /* ifndef BOARD_DISABLE_USBOTG_HSULPI */
/* Enable clocking for USB OTG HS and external PHY */
regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
#else
/* Enable only clocking for USB OTG HS */
regval |= RCC_AHB1ENR_OTGHSEN;
#endif
#endif /* CONFIG_STM32F7_OTGHS */
putreg32(regval, STM32_RCC_AHB1ENR); /* Enable peripherals */

3
configs/Kconfig
View File

@ -959,6 +959,9 @@ config ARCH_BOARD_SPARK
config ARCH_BOARD_PHOTON
bool "Photon wifi board"
depends on ARCH_CHIP_STM32F205RG
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
---help---
A configuration for the Photon from Particle Devices
(https://www.particle.io). This board features the STM32F205RGY6

17
configs/photon/include/board.h
View File

@ -146,6 +146,23 @@
#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK2_FREQUENCY)
#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY)
/* USB OTG HS definitions ***********************************************************/
/* Do not enable external PHY clock or OTG_HS module will not work */
#define BOARD_DISABLE_USBOTG_HSULPI 1
/* LED definitions ******************************************************************/
#define BOARD_LED1 0
#define BOARD_NLEDS 1
#define BOARD_LED1_BIT (1 << BOARD_LED1)
/* Button definitions ***************************************************************/
#define BOARD_BUTTON1 0
#define NUM_BUTTONS 1
#define BOARD_BUTTON1_BIT (1 << BOARD_BUTTON1)
/* Alternate function pin selections ************************************************/
/* UART1 */

10
configs/photon/src/Makefile
View File

@ -41,8 +41,16 @@ ifeq ($(CONFIG_PHOTON_DFU_BOOTLOADER),y)
CSRCS += dfu_signature.c
endif
ifeq ($(CONFIG_BUTTONS),y)
CSRCS += stm32_buttons.c
endif
ifeq ($(CONFIG_USERLED),y)
CSRCS += stm32_leds.c
endif
ifeq ($(CONFIG_PHOTON_WDG),y)
CSRCS += photon_wdt.c
CSRCS += stm32_wdt.c
endif
ifeq ($(CONFIG_STM32_OTGHS),y)

13
configs/photon/src/photon.h
View File

@ -48,6 +48,19 @@
* Pre-processor Definitions
****************************************************************************/
/* LEDs */
#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN13)
/* BUTTONS -- EXTI interrupts are available on Photon board button */
#define MIN_IRQBUTTON BOARD_BUTTON1
#define MAX_IRQBUTTON BOARD_BUTTON1
#define NUM_IRQBUTTONS 1
#define GPIO_BUTTON1 (GPIO_INPUT|GPIO_PULLUP|GPIO_EXTI|GPIO_PORTC|GPIO_PIN7)
/****************************************************************************
* Public Types
****************************************************************************/

41
configs/photon/src/stm32_appinit.c
View File

@ -38,15 +38,15 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/board.h>
#include <arch/board/board.h>
#include "photon.h"
#include <debug.h>
#include <errno.h>
#include <syslog.h>
#include "photon.h"
#include "stm32_wdg.h"
#include <nuttx/input/buttons.h>
#include <nuttx/leds/userled.h>
/****************************************************************************
* Pre-processor Definitions
@ -89,6 +89,36 @@ int board_app_initialize(uintptr_t arg)
{
int ret = OK;
#ifdef CONFIG_USERLED
#ifdef CONFIG_USERLED_LOWER
/* Register the LED driver */
ret = userled_lower_initialize("/dev/userleds");
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n", ret);
return ret;
}
#else
board_userled_initialize();
#endif /* CONFIG_USERLED_LOWER */
#endif /* CONFIG_USERLED */
#ifdef CONFIG_BUTTONS
#ifdef CONFIG_BUTTONS_LOWER
/* Register the BUTTON driver */
ret = btn_lower_initialize("/dev/buttons");
if (ret != OK)
{
syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret);
return ret;
}
#else
board_button_initialize();
#endif /* CONFIG_BUTTONS_LOWER */
#endif /* CONFIG_BUTTONS */
#ifdef CONFIG_STM32_IWDG
stm32_iwdginitialize("/dev/watchdog0", STM32_LSI_FREQUENCY);
#endif
@ -100,9 +130,10 @@ int board_app_initialize(uintptr_t arg)
ret = photon_watchdog_initialize();
if (ret != OK)
{
serr("Failed to start watchdog thread: %d\n", errno);
syslog(LOG_ERR, "Failed to start watchdog thread: %d\n", ret);
return ret;
}
#endif
return ret;
}

100
configs/photon/src/stm32_buttons.c Normal file
View File

@ -0,0 +1,100 @@
/****************************************************************************
* configs/photon/src/stm32_buttons.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <debug.h>
#include <errno.h>
#include <arch/board/board.h>
#include "photon.h"
#include "stm32_gpio.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: board_button_initialize
****************************************************************************/
void board_button_initialize(void)
{
/* Configure Photon button gpio as input */
stm32_configgpio(GPIO_BUTTON1);
}
/****************************************************************************
* Name: board_buttons
****************************************************************************/
uint8_t board_buttons(void)
{
/* Check the state of the only button */
if (stm32_gpioread(GPIO_BUTTON1))
{
return BOARD_BUTTON1_BIT;
}
return 0;
}
/****************************************************************************
* Name: board_button_irq
****************************************************************************/
#ifdef CONFIG_ARCH_IRQBUTTONS
int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
{
if (id != BOARD_BUTTON1)
{
/* Invalid button id */
return -EINVAL;
}
/* Configure interrupt on falling edge only */
return stm32_gpiosetevent(GPIO_BUTTON1, false, true, false,
irqhandler, arg);
}
#endif /* CONFIG_ARCH_IRQBUTTONS */

82
configs/photon/src/stm32_leds.c Normal file
View File

@ -0,0 +1,82 @@
/****************************************************************************
* configs/photon/src/stm32_leds.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <debug.h>
#include <arch/board/board.h>
#include "photon.h"
#include "stm32_gpio.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: board_userled_initialize
****************************************************************************/
void board_userled_initialize(void)
{
/* Configure Photon LED gpio as output */
stm32_configgpio(GPIO_LED1);
}
/****************************************************************************
* Name: board_userled
****************************************************************************/
void board_userled(int led, bool ledon)
{
if (led == BOARD_LED1)
{
stm32_gpiowrite(GPIO_LED1, ledon);
}
}
/****************************************************************************
* Name: board_userled_all
****************************************************************************/
void board_userled_all(uint8_t ledset)
{
stm32_gpiowrite(GPIO_LED1, !!(ledset & BOARD_LED1_BIT));
}

2
configs/photon/src/photon_wdt.c → configs/photon/src/stm32_wdt.c
View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/photon/src/photon_wdt.c
* configs/photon/src/stm32_wdt.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com>