Merged in alinjerpelea/nuttx (pull request #1003)

arm: stm32: codestyle fixes

* arm: stm32f0l0g0: codestyle fixes

    After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* arm: stm32f7: codestyle fixes

    After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* arm: stm32h7: codestyle fixes

    After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* arm: stm32l4: codestyle fixes

    After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* arm: stm32: codestyle fixes

    After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Alin Jerpelea 2019-08-19 15:16:08 +00:00 committed by Gregory Nutt
parent 39d1a02c6d
commit d42fc094fa
1136 changed files with 6808 additions and 6650 deletions

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/axoloti/include/board.h * boards/arm/stm32/axoloti/include/board.h
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>
@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_AXOLOTI_INCLUDE_BOARD_H
#define __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H #define __BOARDS_ARM_STM32_AXOLOTI_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -47,11 +47,11 @@
# include <stdbool.h> # include <stdbool.h>
#endif #endif
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Clocking * Clocking
* The Axoloti board has an external 8MHz crystal. * The Axoloti board has an external 8MHz crystal.
* The SoC can run at 180MHz, but the required USB clock of 48MHz cannot be * The SoC can run at 180MHz, but the required USB clock of 48MHz cannot be
@ -127,7 +127,7 @@
#define STM32_RCC_CFGR_PPRE2 RCC_CFGR_PPRE2_HCLKd2 /* PCLK2 = HCLK / 2 */ #define STM32_RCC_CFGR_PPRE2 RCC_CFGR_PPRE2_HCLKd2 /* PCLK2 = HCLK / 2 */
#define STM32_PCLK2_FREQUENCY (STM32_HCLK_FREQUENCY/2) #define STM32_PCLK2_FREQUENCY (STM32_HCLK_FREQUENCY/2)
/************************************************************************************ /****************************************************************************
* LED Definitions * LED Definitions
* If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any * If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any
* way. The following definitions are used to access individual LEDs. * way. The following definitions are used to access individual LEDs.
@ -146,7 +146,7 @@
#define BOARD_LED1_BIT (1 << BOARD_LED1) #define BOARD_LED1_BIT (1 << BOARD_LED1)
#define BOARD_LED2_BIT (1 << BOARD_LED2) #define BOARD_LED2_BIT (1 << BOARD_LED2)
/************************************************************************************ /****************************************************************************
* Button Definitions * Button Definitions
* There are two buttons on the axoloti, one of them is GPIO connected. The other * There are two buttons on the axoloti, one of them is GPIO connected. The other
* is a reset button and is not under software control. * is a reset button and is not under software control.
@ -156,7 +156,7 @@
#define NUM_BUTTONS 1 #define NUM_BUTTONS 1
#define BUTTON_USER_BIT (1 << BUTTON_USER) #define BUTTON_USER_BIT (1 << BUTTON_USER)
/************************************************************************************ /****************************************************************************
* UARTs * UARTs
* The MIDI in/out ports of the axoloti are connected on USART6. * The MIDI in/out ports of the axoloti are connected on USART6.
* It maybe convenient to run a serial port connected to the header pins, * It maybe convenient to run a serial port connected to the header pins,
@ -176,7 +176,7 @@
#define GPIO_USART6_TX (GPIO_ALT|GPIO_AF8|GPIO_PORTG|GPIO_PIN14| \ #define GPIO_USART6_TX (GPIO_ALT|GPIO_AF8|GPIO_PORTG|GPIO_PIN14| \
GPIO_FLOAT|GPIO_SPEED_2MHz|GPIO_OPENDRAIN) GPIO_FLOAT|GPIO_SPEED_2MHz|GPIO_OPENDRAIN)
/************************************************************************************ /****************************************************************************
* I2C Bus * I2C Bus
* Turn on the internal pullups since there are no external pullups. * Turn on the internal pullups since there are no external pullups.
*/ */
@ -197,7 +197,7 @@
#define GPIO_I2C3_SDA (GPIO_ALT|GPIO_AF4|GPIO_PORTH|GPIO_PIN8| \ #define GPIO_I2C3_SDA (GPIO_ALT|GPIO_AF4|GPIO_PORTH|GPIO_PIN8| \
GPIO_SPEED_2MHz|GPIO_OPENDRAIN|GPIO_PULLUP) GPIO_SPEED_2MHz|GPIO_OPENDRAIN|GPIO_PULLUP)
/************************************************************************************ /****************************************************************************
* SAI Bus * SAI Bus
* Used with the ADAU1961 CODEC * Used with the ADAU1961 CODEC
* PE3_SAI1_SD_B (GPIO_SAI1_SD_B_1) * PE3_SAI1_SD_B (GPIO_SAI1_SD_B_1)
@ -226,7 +226,7 @@
*/ */
#define DMACHAN_SAI1_B DMAMAP_SAI1_B_2 #define DMACHAN_SAI1_B DMAMAP_SAI1_B_2
/************************************************************************************ /****************************************************************************
* SDIO * SDIO
* Used for the SD card interface. * Used for the SD card interface.
* d0 (AF12, PC8) * d0 (AF12, PC8)
@ -272,4 +272,4 @@
#define DMAMAP_SDIO DMAMAP_SDIO_2 #define DMAMAP_SDIO DMAMAP_SDIO_2
#endif /* __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_AXOLOTI_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/axoloti/scripts/Make.defs # boards/arm/stm32/axoloti/scripts/Make.defs
# #
# Copyright (C) 2011-2012, 2016-2017 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012, 2016-2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/scripts/gnu-elf.ld * boards/arm/stm32/axoloti/scripts/gnu-elf.ld
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/scripts/kernel-space.ld * boards/arm/stm32/axoloti/scripts/kernel-space.ld
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/scripts/ld.script * boards/arm/stm32/axoloti/scripts/ld.script
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/scripts/memory.ld * boards/arm/stm32/axoloti/scripts/memory.ld
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -48,7 +48,7 @@
* For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of * For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of
* FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which * FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which
* should fit into 64KB and, of course, can be optimized as needed (See * should fit into 64KB and, of course, can be optimized as needed (See
* also boards/axoloti/scripts/kernel-space.ld). Allowing the * also boards/arm/stm32/axoloti/scripts/kernel-space.ld). Allowing the
* additional does permit addition debug instrumentation to be added to the * additional does permit addition debug instrumentation to be added to the
* kernel space without overflowing the partition. * kernel space without overflowing the partition.
* *

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/scripts/user-space.ld * boards/arm/stm32/axoloti/scripts/user-space.ld
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/axoloti/src/Makefile # boards/arm/stm32/axoloti/src/Makefile
# #
# Copyright (C) 2019 Gregory Nutt. All rights reserved. # Copyright (C) 2019 Gregory Nutt. All rights reserved.
# Author: Jason T. Harris <sirmanlypowers@gmail.com> # Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/axoloti.h * boards/arm/stm32/axoloti/src/axoloti.h
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H #ifndef __BOARDS_ARM_STM32_AXOLOTI_SRC_AXOLOTI_H
#define __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H #define __BOARDS_ARM_STM32_AXOLOTI_SRC_AXOLOTI_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -248,4 +248,4 @@ int stm32_sdram_initialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H */ #endif /* __BOARDS_ARM_STM32_AXOLOTI_SRC_AXOLOTI_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_adau1961.c * boards/arm/stm32/axoloti/src/stm32_adau1961.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_boot.c * boards/arm/stm32/axoloti/src/stm32_boot.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/axoloti/src/stm32_bringup.c * boards/arm/stm32/axoloti/src/stm32_bringup.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_buttons.c * boards/arm/stm32/axoloti/src/stm32_buttons.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_extmem.c * boards/arm/stm32/axoloti/src/stm32_extmem.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/axoloti/src/stm32_sdio.c * boards/arm/stm32/axoloti/src/stm32_sdio.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_usbhost.c * boards/arm/stm32/axoloti/src/stm32_usbhost.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/axoloti/src/stm32_userleds.c * boards/arm/stm32/axoloti/src/stm32_userleds.c
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Jason T. Harris <sirmanlypowers@gmail.com> * Author: Jason T. Harris <sirmanlypowers@gmail.com>

View File

@ -75,7 +75,7 @@ Using JTAG
The Clicker2 comes with the mikroBootloader installed. That bootloader The Clicker2 comes with the mikroBootloader installed. That bootloader
has not been used and is possibly incompatible with the Clicker2-STM32 has not been used and is possibly incompatible with the Clicker2-STM32
linker script at boards/clicker2-stm32/scripts/flash.ld. Often code must linker script at boards/arm/stm32/clicker2-stm32/scripts/flash.ld. Often code must
be built to execute at an offset in to FLASH when a bootloader is used. be built to execute at an offset in to FLASH when a bootloader is used.
Certainly that is the case for the ST-Micro DFU bootloader but I am not Certainly that is the case for the ST-Micro DFU bootloader but I am not
aware of the requirements for use with the mikroBootloader. aware of the requirements for use with the mikroBootloader.

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/include/board.h * boards/arm/stm32/clicker2-stm32/include/board.h
* *
* Copyright (C) 2017 Verge Inc. All rights reserved. * Copyright (C) 2017 Verge Inc. All rights reserved.
* Author: Anthony Merlino <anthony@vergeaero.com> * Author: Anthony Merlino <anthony@vergeaero.com>
@ -36,14 +36,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_CLICKER2_STM32_INCLUDE_BOARD_H
#define __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H #define __BOARDS_ARM_STM32_CLICKER2_STM32_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -58,11 +58,12 @@
# include "stm32.h" # include "stm32.h"
#endif #endif
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *****************************************************************/
/* Clocking *************************************************************************/
/* The Clicker 2 for STM32 board features a 25Hz crystal and 32.768kHz RTC crystal. /* The Clicker 2 for STM32 board features a 25Hz crystal and 32.768kHz RTC crystal.
* *
* This is the canonical configuration: * This is the canonical configuration:
@ -246,7 +247,8 @@
#define LED_ASSERTION 3 #define LED_ASSERTION 3
#define LED_PANIC 4 #define LED_PANIC 4
/* Button definitions ***************************************************************/ /* Button definitions *******************************************************/
/* The Mikroe Clicker2 STM32 has two buttons available to software: /* The Mikroe Clicker2 STM32 has two buttons available to software:
* *
* T2 - PE0, Low sensed when pressed * T2 - PE0, Low sensed when pressed
@ -260,7 +262,8 @@
#define BUTTON_T2_BIT (1 << BUTTON_T2) #define BUTTON_T2_BIT (1 << BUTTON_T2)
#define BUTTON_T3_BIT (1 << BUTTON_T3) #define BUTTON_T3_BIT (1 << BUTTON_T3)
/* Alternate function pin selections ************************************************/ /* Alternate function pin selections ****************************************/
/* U[S]ARTs /* U[S]ARTs
* *
* USART2 - mikroBUS1 * USART2 - mikroBUS1
@ -316,7 +319,8 @@
#define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_2 /* PE9 */ #define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_2 /* PE9 */
#define GPIO_TIM4_CH1OUT GPIO_TIM4_CH1OUT_2 /* PD12 */ #define GPIO_TIM4_CH1OUT GPIO_TIM4_CH1OUT_2 /* PD12 */
/* DMA Channl/Stream Selections *****************************************************/ /* DMA Channl/Stream Selections *********************************************/
/* Stream selections are arbitrary for now but might become important in the future /* Stream selections are arbitrary for now but might become important in the future
* if we set aside more DMA channels/streams. * if we set aside more DMA channels/streams.
* *
@ -327,4 +331,4 @@
#define DMAMAP_SDIO DMAMAP_SDIO_1 #define DMAMAP_SDIO DMAMAP_SDIO_1
#endif /* __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_CLICKER2_STM32_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/clicker2-stm32/kernel/Makefile # boards/arm/stm32/clicker2-stm32/kernel/Makefile
# #
# Copyright (C) 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/kernel/stm32_userspace.c * boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -51,6 +51,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifndef CONFIG_NUTTX_USERSPACE #ifndef CONFIG_NUTTX_USERSPACE

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/clicker2-stm32/scripts/Make.defs # boards/arm/stm32/clicker2-stm32/scripts/Make.defs
# #
# Copyright (C) 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/scripts/flash.ld * boards/arm/stm32/clicker2-stm32/scripts/flash.ld
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/scripts/gnu-elf.ld * boards/arm/stm32/clicker2-stm32/scripts/gnu-elf.ld
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/scripts/kernel-space.ld * boards/arm/stm32/clicker2-stm32/scripts/kernel-space.ld
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/scripts/memory.ld * boards/arm/stm32/clicker2-stm32/scripts/memory.ld
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -47,7 +47,7 @@
* For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of * For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of
* FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which * FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which
* should fit into 64KB and, of course, can be optimized as needed (See * should fit into 64KB and, of course, can be optimized as needed (See
* also boards/clicker2-stm32/scripts/kernel-space.ld). Allowing the * also boards/arm/stm32/clicker2-stm32/scripts/kernel-space.ld). Allowing the
* additional does permit addition debug instrumentation to be added to the * additional does permit addition debug instrumentation to be added to the
* kernel space without overflowing the partition. * kernel space without overflowing the partition.
* *

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/scripts/user-space.ld * boards/arm/stm32/clicker2-stm32/scripts/user-space.ld
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/clicker2-stm32/src/Makefile # boards/arm/stm32/clicker2-stm32/src/Makefile
# #
# Copyright (C) 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/clicker2-stm32.h * boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H #ifndef __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H
#define __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H #define __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -58,6 +58,7 @@
#define HAVE_AUTOMOUNTER 1 #define HAVE_AUTOMOUNTER 1
/* MMCSD */ /* MMCSD */
/* Only support uSD click board */ /* Only support uSD click board */
#if !defined(CONFIG_CLICKER2_STM32_MB1_MMCSD) && \ #if !defined(CONFIG_CLICKER2_STM32_MB1_MMCSD) && \
@ -182,6 +183,7 @@
*/ */
/* USB device */ /* USB device */
/* USB device */ /* USB device */
#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_PORTA|GPIO_PIN9) #define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_PORTA|GPIO_PIN9)
@ -192,6 +194,7 @@
#define GPIO_PWR_BATSTAT (GPIO_INPUT|GPIO_FLOAT|GPIO_PORTD|GPIO_PIN4) #define GPIO_PWR_BATSTAT (GPIO_INPUT|GPIO_FLOAT|GPIO_PORTD|GPIO_PIN4)
/* mikroBUS *************************************************************************/ /* mikroBUS *************************************************************************/
/* U[S]ARTs /* U[S]ARTs
* *
* USART2 - mikroBUS1 * USART2 - mikroBUS1
@ -252,9 +255,9 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
@ -267,7 +270,7 @@
void weak_function stm32_spidev_initialize(void); void weak_function stm32_spidev_initialize(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_bringup * Name: stm32_bringup
* *
* Description: * Description:
@ -279,30 +282,30 @@ void weak_function stm32_spidev_initialize(void);
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y :
* Called from the NSH library * Called from the NSH library
* *
************************************************************************************/ ****************************************************************************/
int stm32_bringup(void); int stm32_bringup(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_usb_configure * Name: stm32_usb_configure
* *
* Description: * Description:
* Called from stm32_boardinitialize very early in inialization to setup USB-related * Called from stm32_boardinitialize very early in inialization to setup USB-related
* GPIO pins for the Mikroe Clicker2 STM32 board. * GPIO pins for the Mikroe Clicker2 STM32 board.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_OTGFS #ifdef CONFIG_STM32_OTGFS
void stm32_usb_configure(void); void stm32_usb_configure(void);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_adc_setup * Name: stm32_adc_setup
* *
* Description: * Description:
* Initialize ADC and register the ADC driver. * Initialize ADC and register the ADC driver.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
int stm32_adc_setup(void); int stm32_adc_setup(void);
@ -383,7 +386,7 @@ int stm32_mmcsd_initialize(void);
bool stm32_cardinserted(int slotno); bool stm32_cardinserted(int slotno);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_automount_initialize * Name: stm32_automount_initialize
* *
* Description: * Description:
@ -395,13 +398,13 @@ bool stm32_cardinserted(int slotno);
* Returned Value: * Returned Value:
* None * None
* *
************************************************************************************/ ****************************************************************************/
#ifdef HAVE_AUTOMOUNTER #ifdef HAVE_AUTOMOUNTER
int stm32_automount_initialize(void); int stm32_automount_initialize(void);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_automount_event * Name: stm32_automount_event
* *
* Description: * Description:
@ -420,11 +423,11 @@ int stm32_automount_initialize(void);
* Assumptions: * Assumptions:
* Interrupts are disabled. * Interrupts are disabled.
* *
************************************************************************************/ ****************************************************************************/
#ifdef HAVE_AUTOMOUNTER #ifdef HAVE_AUTOMOUNTER
void stm32_automount_event(int slotno, bool inserted); void stm32_automount_event(int slotno, bool inserted);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H */ #endif /* __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_adc.c * boards/arm/stm32/clicker2-stm32/src/stm32_adc.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -52,11 +52,12 @@
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/
/* Configuration ********************************************************************/
/* Up to 3 ADC interfaces are supported */ /* Up to 3 ADC interfaces are supported */
#if STM32_NADC < 3 #if STM32_NADC < 3
@ -80,9 +81,10 @@
#define ADC1_NCHANNELS 1 #define ADC1_NCHANNELS 1
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
/* The Olimex STM32-P407 has a 10 Kohm potentiometer AN_TR connected to PC0 /* The Olimex STM32-P407 has a 10 Kohm potentiometer AN_TR connected to PC0
* ADC123_IN10 * ADC123_IN10
*/ */
@ -97,17 +99,17 @@ static const uint8_t g_chanlist[ADC1_NCHANNELS] = {10};
static const uint32_t g_pinlist[ADC1_NCHANNELS] = {GPIO_ADC1_IN10}; static const uint32_t g_pinlist[ADC1_NCHANNELS] = {GPIO_ADC1_IN10};
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_adc_setup * Name: stm32_adc_setup
* *
* Description: * Description:
* Initialize ADC and register the ADC driver. * Initialize ADC and register the ADC driver.
* *
************************************************************************************/ ****************************************************************************/
int stm32_adc_setup(void) int stm32_adc_setup(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/clicker2-stm32/src/stm32_appinit.c * boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_autoleds.c * boards/arm/stm32/clicker2-stm32/src/stm32_autoleds.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,6 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 2 LEDs on /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 2 LEDs on
* board the Clicker2 for STM32. The following definitions describe how * board the Clicker2 for STM32. The following definitions describe how
* NuttX controls the LEDs: * NuttX controls the LEDs:

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_automount.c * boards/arm/stm32/clicker2-stm32/src/stm32_automount.c
* *
* Copyright (C) 2017 Verge Inc. All rights reserved. * Copyright (C) 2017 Verge Inc. All rights reserved.
* Author: Anthony Merlino <anthony@vergeaero.com> * Author: Anthony Merlino <anthony@vergeaero.com>
@ -33,11 +33,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -55,13 +55,13 @@
#ifdef HAVE_AUTOMOUNTER #ifdef HAVE_AUTOMOUNTER
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
/* This structure represents the changeable state of the automounter */ /* This structure represents the changeable state of the automounter */
struct stm32_automount_state_s struct stm32_automount_state_s
@ -85,18 +85,18 @@ struct stm32_automount_config_s
FAR struct stm32_automount_state_s *state; /* Changeable state */ FAR struct stm32_automount_state_s *state; /* Changeable state */
}; };
/************************************************************************************ /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
************************************************************************************/ ****************************************************************************/
static int stm32_attach(FAR const struct automount_lower_s *lower, static int stm32_attach(FAR const struct automount_lower_s *lower,
automount_handler_t isr, FAR void *arg); automount_handler_t isr, FAR void *arg);
static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable); static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable);
static bool stm32_inserted(FAR const struct automount_lower_s *lower); static bool stm32_inserted(FAR const struct automount_lower_s *lower);
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_CLICKER2_STM32_MB1_MMCSD_AUTOMOUNT #ifdef CONFIG_CLICKER2_STM32_MB1_MMCSD_AUTOMOUNT
static struct stm32_automount_state_s g_mb1_mmcsdstate; static struct stm32_automount_state_s g_mb1_mmcsdstate;
@ -138,11 +138,11 @@ static const struct stm32_automount_config_s g_mb2_mmcsdconfig =
}; };
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_attach * Name: stm32_attach
* *
* Description: * Description:
@ -156,7 +156,7 @@ static const struct stm32_automount_config_s g_mb2_mmcsdconfig =
* Returned Value: * Returned Value:
* Always returns OK * Always returns OK
* *
************************************************************************************/ ****************************************************************************/
static int stm32_attach(FAR const struct automount_lower_s *lower, static int stm32_attach(FAR const struct automount_lower_s *lower,
automount_handler_t isr, FAR void *arg) automount_handler_t isr, FAR void *arg)
@ -182,7 +182,7 @@ static int stm32_attach(FAR const struct automount_lower_s *lower,
return OK; return OK;
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_enable * Name: stm32_enable
* *
* Description: * Description:
@ -195,7 +195,7 @@ static int stm32_attach(FAR const struct automount_lower_s *lower,
* Returned Value: * Returned Value:
* None * None
* *
************************************************************************************/ ****************************************************************************/
static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable) static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable)
{ {
@ -233,7 +233,7 @@ static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable)
leave_critical_section(flags); leave_critical_section(flags);
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_inserted * Name: stm32_inserted
* *
* Description: * Description:
@ -245,7 +245,7 @@ static void stm32_enable(FAR const struct automount_lower_s *lower, bool enable)
* Returned Value: * Returned Value:
* True if the card is inserted; False otherwise * True if the card is inserted; False otherwise
* *
************************************************************************************/ ****************************************************************************/
static bool stm32_inserted(FAR const struct automount_lower_s *lower) static bool stm32_inserted(FAR const struct automount_lower_s *lower)
{ {
@ -257,11 +257,11 @@ static bool stm32_inserted(FAR const struct automount_lower_s *lower)
return stm32_cardinserted(config->mmcsd); return stm32_cardinserted(config->mmcsd);
} }
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_automount_initialize * Name: stm32_automount_initialize
* *
* Description: * Description:
@ -273,7 +273,7 @@ static bool stm32_inserted(FAR const struct automount_lower_s *lower)
* Returned Value: * Returned Value:
* None * None
* *
************************************************************************************/ ****************************************************************************/
int stm32_automount_initialize(void) int stm32_automount_initialize(void)
{ {
@ -306,7 +306,7 @@ int stm32_automount_initialize(void)
return OK; return OK;
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_automount_event * Name: stm32_automount_event
* *
* Description: * Description:
@ -328,7 +328,7 @@ int stm32_automount_initialize(void)
* Assumptions: * Assumptions:
* Interrupts are disabled. * Interrupts are disabled.
* *
************************************************************************************/ ****************************************************************************/
void stm32_automount_event(int slotno, bool inserted) void stm32_automount_event(int slotno, bool inserted)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_boot.c * boards/arm/stm32/clicker2-stm32/src/stm32_boot.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -47,11 +47,11 @@
#include "clicker2-stm32.h" #include "clicker2-stm32.h"
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
* Description: * Description:
@ -59,7 +59,7 @@
* is called early in the intitialization -- after all memory has been configured * is called early in the intitialization -- after all memory has been configured
* and mapped but before any devices have been initialized. * and mapped but before any devices have been initialized.
* *
************************************************************************************/ ****************************************************************************/
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/clicker2-stm32/src/stm32_bringup.c * boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_buttons.c * boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -101,7 +101,7 @@ uint32_t board_buttons(void)
return ret; return ret;
} }
/************************************************************************************ /****************************************************************************
* Button support. * Button support.
* *
* Description: * Description:
@ -121,7 +121,7 @@ uint32_t board_buttons(void)
* BUTTON_* definitions in board.h for the meaning of enumeration * BUTTON_* definitions in board.h for the meaning of enumeration
* value. * value.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_IRQBUTTONS #ifdef CONFIG_ARCH_IRQBUTTONS
int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_can.c * boards/arm/stm32/clicker2-stm32/src/stm32_can.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -51,9 +51,9 @@
#ifdef CONFIG_CAN #ifdef CONFIG_CAN
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Configuration ********************************************************************/ /* Configuration ********************************************************************/
#if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2) #if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)
@ -67,17 +67,17 @@
# define CAN_PORT 2 # define CAN_PORT 2
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_can_setup * Name: stm32_can_setup
* *
* Description: * Description:
* Initialize CAN and register the CAN device * Initialize CAN and register the CAN device
* *
************************************************************************************/ ****************************************************************************/
int stm32_can_setup(void) int stm32_can_setup(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_mmcsd.c * boards/arm/stm32/clicker2-stm32/src/stm32_mmcsd.c
* *
* Copyright (C) 2017 Verge Inc. All rights reserved. * Copyright (C) 2017 Verge Inc. All rights reserved.
* Author: Anthony Merlino <anthony@vergeaero.com> * Author: Anthony Merlino <anthony@vergeaero.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_mrf24j40.c * boards/arm/stm32/clicker2-stm32/src/stm32_mrf24j40.c
* *
* Copyright (C) 2017 Gregory Nutt, All rights reserver * Copyright (C) 2017 Gregory Nutt, All rights reserver
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_spi.c * boards/arm/stm32/clicker2-stm32/src/stm32_spi.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -55,17 +55,17 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the Mikroe Clicker2 STM32 board. * Called to configure SPI chip select GPIO pins for the Mikroe Clicker2 STM32 board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void) void weak_function stm32_spidev_initialize(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/clicker2-stm32/src/stm32_usb.c * boards/arm/stm32/clicker2-stm32/src/stm32_usb.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -49,9 +49,9 @@
#ifdef CONFIG_STM32_OTGFS #ifdef CONFIG_STM32_OTGFS
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
# define HAVE_USB 1 # define HAVE_USB 1
@ -60,18 +60,18 @@
# undef HAVE_USB # undef HAVE_USB
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_usb_configure * Name: stm32_usb_configure
* *
* Description: * Description:
* Called from stm32_boardinitialize very early in inialization to setup USB-related * Called from stm32_boardinitialize very early in inialization to setup USB-related
* GPIO pins for the Olimex STM32 P407 board. * GPIO pins for the Olimex STM32 P407 board.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usb_configure(void) void stm32_usb_configure(void)
{ {
@ -84,7 +84,7 @@ void stm32_usb_configure(void)
#endif #endif
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_usbsuspend * Name: stm32_usbsuspend
* *
* Description: * Description:
@ -93,7 +93,7 @@ void stm32_usb_configure(void)
* This is an opportunity for the board logic to shutdown clocks, power, etc. * This is an opportunity for the board logic to shutdown clocks, power, etc.
* while the USB is suspended. * while the USB is suspended.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_userleds.c * boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/clicker2-stm32/src/stm32_xbee.c * boards/arm/stm32/clicker2-stm32/src/stm32_xbee.c
* *
* Copyright (C) 2017 Verge Inc. All rights reserved. * Copyright (C) 2017 Verge Inc. All rights reserved.
* Author: Anthony Merlino <anthony@vergeaero.com> * Author: Anthony Merlino <anthony@vergeaero.com>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/include/board.h * boards/arm/stm32/cloudctrl/include/board.h
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,14 +32,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_CLOUDCTRL_INCLUDE_BOARD_H
#define __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H 1 #define __BOARDS_ARM_STM32_CLOUDCTRL_INCLUDE_BOARD_H 1
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -52,9 +52,9 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *************************************************************************/
@ -293,9 +293,9 @@
* 15 PC0 POTENTIO_METER GPIO_ADC12_IN10 * 15 PC0 POTENTIO_METER GPIO_ADC12_IN10
*/ */
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -307,11 +307,11 @@ extern "C" {
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_lcdclear * Name: stm32_lcdclear
* *
* Description: * Description:
@ -320,11 +320,11 @@ extern "C" {
* sequences of runs that covers the entire display can be very slow. Here the * sequences of runs that covers the entire display can be very slow. Here the
* display is cleared by simply setting all GRAM memory to the specified color. * display is cleared by simply setting all GRAM memory to the specified color.
* *
************************************************************************************/ ****************************************************************************/
void stm32_lcdclear(uint16_t color); void stm32_lcdclear(uint16_t color);
/************************************************************************************ /****************************************************************************
* Relay control functions * Relay control functions
* *
* Description: * Description:
@ -332,7 +332,7 @@ void stm32_lcdclear(uint16_t color);
* *
* NOTE: These must match the prototypes in include/nuttx/arch.h * NOTE: These must match the prototypes in include/nuttx/arch.h
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_RELAYS #ifdef CONFIG_ARCH_RELAYS
void up_relaysinit(void); void up_relaysinit(void);
@ -348,13 +348,13 @@ void relays_resetmodes(uint32_t relays_stat);
void relays_powermodes(uint32_t relays_stat); void relays_powermodes(uint32_t relays_stat);
#endif #endif
/************************************************************************************ /****************************************************************************
* Chip ID functions * Chip ID functions
* *
* Description: * Description:
* Non-standard functions to obtain chip ID information. * Non-standard functions to obtain chip ID information.
* *
************************************************************************************/ ****************************************************************************/
const char *stm32_getchipid(void); const char *stm32_getchipid(void);
const char *stm32_getchipid_string(void); const char *stm32_getchipid_string(void);
@ -365,4 +365,4 @@ const char *stm32_getchipid_string(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_CLOUDCTRL_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/cloudctrl/scripts/Make.defs # boards/arm/stm32/cloudctrl/scripts/Make.defs
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/scripts/cloudctrl-dfu.ld * boards/arm/stm32/cloudctrl/scripts/cloudctrl-dfu.ld
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/scripts/cloudctrl.ld * boards/arm/stm32/cloudctrl/scripts/cloudctrl.ld
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/cloudctrl/src/Makefile # boards/arm/stm32/cloudctrl/src/Makefile
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************************************** /****************************************************************************
* boards/cloudctrl/src/cloudctrl.h * boards/arm/stm32/cloudctrl/src/cloudctrl.h
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,23 +32,23 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H #ifndef __BOARDS_ARM_STM32_CLOUDCTRLL_SRC_CLOUDCTRL_H
#define __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H #define __BOARDS_ARM_STM32_CLOUDCTRLL_SRC_CLOUDCTRL_H
/**************************************************************************************************** /****************************************************************************
* Included Files * Included Files
****************************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <stdint.h> #include <stdint.h>
/**************************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************************************/ /* Configuration ****************************************************************************/
/* How many SPI modules does this chip support? */ /* How many SPI modules does this chip support? */
#if STM32_NSPI < 1 #if STM32_NSPI < 1
@ -64,7 +64,7 @@
/* cloudctrl GPIO Configuration **********************************************************************/ /* cloudctrl GPIO Configuration **********************************************************************/
/* STM3240G-EVAL GPIOs ******************************************************************************/ /* STM3240G-EVAL GPIOs ****************************************************************************/
/* Ethernet /* Ethernet
* *
* -- ---- -------------- ---------------------------------------------------------- * -- ---- -------------- ----------------------------------------------------------
@ -204,63 +204,63 @@
#define GPIO_RELAYS_R01 (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ #define GPIO_RELAYS_R01 (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN1) GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN1)
/**************************************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************************************/ ****************************************************************************/
/**************************************************************************************************** /****************************************************************************
* Public data * Public data
****************************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/**************************************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************************************/ ****************************************************************************/
/**************************************************************************************************** /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the STM3240G-EVAL board. * Called to configure SPI chip select GPIO pins for the STM3240G-EVAL board.
* *
****************************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void); void weak_function stm32_spidev_initialize(void);
/**************************************************************************************************** /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called from stm32_usbinitialize very early in inialization to setup USB-related GPIO pins for * Called from stm32_usbinitialize very early in inialization to setup USB-related GPIO pins for
* the STM3240G-EVAL board. * the STM3240G-EVAL board.
* *
****************************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_OTGFS #ifdef CONFIG_STM32_OTGFS
void weak_function stm32_usbinitialize(void); void weak_function stm32_usbinitialize(void);
#endif #endif
/**************************************************************************************************** /****************************************************************************
* Name: stm32_usbhost_initialize * Name: stm32_usbhost_initialize
* *
* Description: * Description:
* Called at application startup time to initialize the USB host functionality. This function will * Called at application startup time to initialize the USB host functionality. This function will
* start a thread that will monitor for device connection/disconnection events. * start a thread that will monitor for device connection/disconnection events.
* *
****************************************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) #if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST)
int stm32_usbhost_initialize(void); int stm32_usbhost_initialize(void);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_adc_setup * Name: stm32_adc_setup
* *
* Description: * Description:
* Initialize ADC and register the ADC driver. * Initialize ADC and register the ADC driver.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
int stm32_adc_setup(void); int stm32_adc_setup(void);
@ -290,4 +290,4 @@ int stm32_w25initialize(int minor);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H */ #endif /* __BOARDS_ARM_STM32_CLOUDCTRLL_SRC_CLOUDCTRL_H */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_adc.c * boards/arm/stm32/cloudctrl/src/stm32_adc.c
* *
* Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -55,9 +55,9 @@
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Configuration ********************************************************************/ /* Configuration ********************************************************************/
/* Up to 3 ADC interfaces are supported */ /* Up to 3 ADC interfaces are supported */
@ -82,9 +82,9 @@
#define ADC1_NCHANNELS 1 #define ADC1_NCHANNELS 1
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
/* Identifying number of each ADC channel. The only internal signal for ADC testing /* Identifying number of each ADC channel. The only internal signal for ADC testing
* is the potentiometer input: * is the potentiometer input:
@ -105,17 +105,17 @@ static const uint8_t g_chanlist[ADC1_NCHANNELS] = {10}; //{10, 8, 9};
static const uint32_t g_pinlist[ADC1_NCHANNELS] = {GPIO_ADC12_IN10}; //{GPIO_ADC12_IN10, GPIO_ADC12_IN8, GPIO_ADC12_IN9}; static const uint32_t g_pinlist[ADC1_NCHANNELS] = {GPIO_ADC12_IN10}; //{GPIO_ADC12_IN10, GPIO_ADC12_IN8, GPIO_ADC12_IN9};
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_adc_setup * Name: stm32_adc_setup
* *
* Description: * Description:
* Initialize ADC and register the ADC driver. * Initialize ADC and register the ADC driver.
* *
************************************************************************************/ ****************************************************************************/
int stm32_adc_setup(void) int stm32_adc_setup(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/cloudctrl/src/stm32_appinit.c * boards/arm/stm32/cloudctrl/src/stm32_appinit.c
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/src/stm32_autoleds.c * boards/arm/stm32/cloudctrl/src/stm32_autoleds.c
* *
* Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -120,9 +120,9 @@
#define LED_PANIC_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_PANIC_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT)
#define LED_PANIC_OFF_CLRBITS ((CLOUDCTRL_LED3) << OFF_CLRBITS_SHIFT) #define LED_PANIC_OFF_CLRBITS ((CLOUDCTRL_LED3) << OFF_CLRBITS_SHIFT)
/************************************************************************************** /****************************************************************************
* Private Function Protototypes * Private Function Protototypes
**************************************************************************************/ ****************************************************************************/
/* LED State Controls */ /* LED State Controls */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_boot.c * boards/arm/stm32/cloudctrl/src/stm32_boot.c
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -48,19 +48,19 @@
#include "up_arch.h" #include "up_arch.h"
#include "cloudctrl.h" #include "cloudctrl.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
* Description: * Description:
@ -68,7 +68,7 @@
* is called early in the initialization -- after all memory has been configured * is called early in the initialization -- after all memory has been configured
* and mapped but before any devices have been initialized. * and mapped but before any devices have been initialized.
* *
************************************************************************************/ ****************************************************************************/
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/src/stm32_buttons.c * boards/arm/stm32/cloudctrl/src/stm32_buttons.c
* *
* Copyright (C) 2012, 2014-2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2014-2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_chipid.c * boards/arm/stm32/cloudctrl/src/stm32_chipid.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -46,17 +46,17 @@
#include "up_arch.h" #include "up_arch.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
const char *stm32_getchipid(void) const char *stm32_getchipid(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_phyinit.c * boards/arm/stm32/cloudctrl/src/stm32_phyinit.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -45,17 +45,17 @@
#include "cloudctrl.h" #include "cloudctrl.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
#if defined(CONFIG_ETH0_PHY_DM9161) && defined(CONFIG_STM32_PHYINIT) #if defined(CONFIG_ETH0_PHY_DM9161) && defined(CONFIG_STM32_PHYINIT)
int stm32_phy_boardinitialize(int intf) int stm32_phy_boardinitialize(int intf)

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/src/stm32_relays.c * boards/arm/stm32/cloudctrl/src/stm32_relays.c
* *
* Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_spi.c * boards/arm/stm32/cloudctrl/src/stm32_spi.c
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -54,17 +54,17 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the cloudctrl board. * Called to configure SPI chip select GPIO pins for the cloudctrl board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void) void weak_function stm32_spidev_initialize(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/cloudctrl/src/stm32_usb.c * boards/arm/stm32/cloudctrl/src/stm32_usb.c
* *
* Copyright (C) 2012-2013, 2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -60,9 +60,9 @@
#ifdef CONFIG_STM32_OTGFS #ifdef CONFIG_STM32_OTGFS
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST) #if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
# define HAVE_USB 1 # define HAVE_USB 1
@ -83,25 +83,25 @@
# endif # endif
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBHOST #ifdef CONFIG_USBHOST
static struct usbhost_connection_s *g_usbconn; static struct usbhost_connection_s *g_usbconn;
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: usbhost_waiter * Name: usbhost_waiter
* *
* Description: * Description:
* Wait for USB devices to be connected. * Wait for USB devices to be connected.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBHOST #ifdef CONFIG_USBHOST
static int usbhost_waiter(int argc, char *argv[]) static int usbhost_waiter(int argc, char *argv[])
@ -132,18 +132,18 @@ static int usbhost_waiter(int argc, char *argv[])
} }
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called from stm32_usbinitialize very early in inialization to setup USB-related * Called from stm32_usbinitialize very early in inialization to setup USB-related
* GPIO pins for the STM3240G-EVAL board. * GPIO pins for the STM3240G-EVAL board.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usbinitialize(void) void stm32_usbinitialize(void)
{ {
@ -158,7 +158,7 @@ void stm32_usbinitialize(void)
#endif #endif
} }
/*********************************************************************************** /****************************************************************************
* Name: stm32_usbhost_initialize * Name: stm32_usbhost_initialize
* *
* Description: * Description:
@ -166,7 +166,7 @@ void stm32_usbinitialize(void)
* This function will start a thread that will monitor for device * This function will start a thread that will monitor for device
* connection/disconnection events. * connection/disconnection events.
* *
***********************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBHOST #ifdef CONFIG_USBHOST
int stm32_usbhost_initialize(void) int stm32_usbhost_initialize(void)
@ -220,7 +220,7 @@ int stm32_usbhost_initialize(void)
} }
#endif #endif
/*********************************************************************************** /****************************************************************************
* Name: stm32_usbhost_vbusdrive * Name: stm32_usbhost_vbusdrive
* *
* Description: * Description:
@ -244,7 +244,7 @@ int stm32_usbhost_initialize(void)
* Returned Value: * Returned Value:
* None * None
* *
***********************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBHOST #ifdef CONFIG_USBHOST
void stm32_usbhost_vbusdrive(int iface, bool enable) void stm32_usbhost_vbusdrive(int iface, bool enable)
@ -266,7 +266,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
} }
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_setup_overcurrent * Name: stm32_setup_overcurrent
* *
* Description: * Description:
@ -281,7 +281,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
* Zero (OK) is returned on success. Otherwise, a negated errno value is returned * Zero (OK) is returned on success. Otherwise, a negated errno value is returned
* to indicate the nature of the failure. * to indicate the nature of the failure.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBHOST #ifdef CONFIG_USBHOST
int stm32_setup_overcurrent(xcpt_t handler, void *arg) int stm32_setup_overcurrent(xcpt_t handler, void *arg)
@ -290,7 +290,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg)
} }
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_usbsuspend * Name: stm32_usbsuspend
* *
* Description: * Description:
@ -299,7 +299,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg)
* This is an opportunity for the board logic to shutdown clocks, power, etc. * This is an opportunity for the board logic to shutdown clocks, power, etc.
* while the USB is suspended. * while the USB is suspended.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/src/stm32_usbmsc.c * boards/arm/stm32/cloudctrl/src/stm32_usbmsc.c
* *
* Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/cloudctrl/src/stm32_userleds.c * boards/arm/stm32/cloudctrl/src/stm32_userleds.c
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/cloudctrl/src/stm32_w25.c * boards/arm/stm32/cloudctrl/src/stm32_w25.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -228,13 +228,13 @@ OpenOCD
======= =======
I have also used OpenOCD with the M3 Wildfire. In this case, I used I have also used OpenOCD with the M3 Wildfire. In this case, I used
the Olimex USB ARM OCD. See the script in boards/fire-stm32v2/tools/oocd.sh the Olimex USB ARM OCD. See the script in boards/arm/stm32/fire-stm32v2/tools/oocd.sh
for more information. Using the script: for more information. Using the script:
1) Start the OpenOCD GDB server 1) Start the OpenOCD GDB server
cd <nuttx-build-directory> cd <nuttx-build-directory>
boards/fire-stm32v2/tools/oocd.sh $PWD boards/arm/stm32/fire-stm32v2/tools/oocd.sh $PWD
2) Load Nuttx 2) Load Nuttx

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/include/board.h * boards/arm/stm32/fire-stm32v2/include/board.h
* include/arch/board/board.h * include/arch/board/board.h
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
@ -32,14 +32,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_FIRE_STM32V2_INCLUDE_BOARD_H
#define __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H #define __BOARDS_ARM_STM32_FIRE_STM32V2_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -49,9 +49,9 @@
#include "stm32_sdio.h" #include "stm32_sdio.h"
#include "stm32.h" #include "stm32.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *************************************************************************/
@ -362,9 +362,9 @@
# error "SPI1 requires CONFIG_STM32_CAN1_REMAP1=y" # error "SPI1 requires CONFIG_STM32_CAN1_REMAP1=y"
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -377,11 +377,11 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: fire_lcdclear * Name: fire_lcdclear
* *
* Description: * Description:
@ -390,7 +390,7 @@ extern "C"
* sequences of runs that covers the entire display can be very slow. Here the * sequences of runs that covers the entire display can be very slow. Here the
* dispaly is cleared by simply setting all GRAM memory to the specified color. * dispaly is cleared by simply setting all GRAM memory to the specified color.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_FSMC #ifdef CONFIG_STM32_FSMC
void fire_lcdclear(uint16_t color); void fire_lcdclear(uint16_t color);
@ -402,4 +402,4 @@ void fire_lcdclear(uint16_t color);
#undef EXTERN #undef EXTERN
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_FIRE_STM32V2_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/fire-stm32v2/scripts/Make.defs # boards/arm/stm32/fire-stm32v2/scripts/Make.defs
# #
# Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/scripts/fire-stm32v2-dfu.ld * boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2-dfu.ld
* *
* Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/scripts/fire-stm32v2.ld * boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2.ld
* *
* Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/fire-stm32v2/src/Makefile # boards/arm/stm32/fire-stm32v2/src/Makefile
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/src/fire-stm32v2.h * boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h
* arch/arm/src/board/fire-stm32v2.n * arch/arm/src/board/fire-stm32v2.n
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
@ -32,22 +32,22 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H #ifndef __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H
#define __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H #define __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <stdint.h> #include <stdint.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* How many SPI modules does this chip support? Most support 2 SPI modules (others /* How many SPI modules does this chip support? Most support 2 SPI modules (others
* may support more -- in such case, the following must be expanded). * may support more -- in such case, the following must be expanded).
@ -265,47 +265,47 @@
#define GPIO_MP3_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\ #define GPIO_MP3_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN6) GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN6)
/************************************************************************************ /****************************************************************************
* Public Types * Public Types
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public data * Public data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the M3 Wildfire board. * Called to configure SPI chip select GPIO pins for the M3 Wildfire board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void); void weak_function stm32_spidev_initialize(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called to setup USB-related GPIO pins for the M3 Wildfire board. * Called to setup USB-related GPIO pins for the M3 Wildfire board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_usbinitialize(void); void weak_function stm32_usbinitialize(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_selectlcd * Name: stm32_selectlcd
* *
* Description: * Description:
* Initialize to the LCD * Initialize to the LCD
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_FSMC #ifdef CONFIG_STM32_FSMC
void stm32_selectlcd(void); void stm32_selectlcd(void);
@ -335,5 +335,5 @@ int stm32_w25initialize(int minor);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H */ #endif /* __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/fire-stm32v2/src/stm32_appinit.c * boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/src/stm32_autoleds.c * boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c
* *
* Copyright (C) 2012-2013, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -124,9 +124,9 @@
#define LED_FLASH_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT) #define LED_FLASH_OFF_SETBITS ((0) << OFF_SETBITS_SHIFT)
#define LED_FLASH_OFF_CLRBITS ((FIRE_LED3) << OFF_CLRBITS_SHIFT) #define LED_FLASH_OFF_CLRBITS ((FIRE_LED3) << OFF_CLRBITS_SHIFT)
/************************************************************************************** /****************************************************************************
* Private Function Protototypes * Private Function Protototypes
**************************************************************************************/ ****************************************************************************/
/* LED State Controls */ /* LED State Controls */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/src/stm32_boot.c * boards/arm/stm32/fire-stm32v2/src/stm32_boot.c
* *
* Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -47,19 +47,19 @@
#include "up_arch.h" #include "up_arch.h"
#include "fire-stm32v2.h" #include "fire-stm32v2.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
* Description: * Description:
@ -67,7 +67,7 @@
* is called early in the intitialization -- after all memory has been configured * is called early in the intitialization -- after all memory has been configured
* and mapped but before any devices have been initialized. * and mapped but before any devices have been initialized.
* *
************************************************************************************/ ****************************************************************************/
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/src/stm32_buttons.c * boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c
* *
* Copyright (C) 2012, 2014-2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2014-2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/src/stm32_enc28j60.c * boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c
* *
* Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/fire-stm32v2/src/stm32_mmcsd.c * boards/arm/stm32/fire-stm32v2/src/stm32_mmcsd.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/src/stm32_selectlcd.c * boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -55,9 +55,9 @@
#ifdef CONFIG_STM32_FSMC #ifdef CONFIG_STM32_FSMC
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#ifndef CONFIG_STM32_FSMC #ifndef CONFIG_STM32_FSMC
# warning "FSMC is not enabled" # warning "FSMC is not enabled"
@ -67,9 +67,9 @@
# error "Required GPIO ports not enabled" # error "Required GPIO ports not enabled"
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
/* 2.4" TFT + Touchscreen. FSMC Bank1 /* 2.4" TFT + Touchscreen. FSMC Bank1
* *
@ -131,25 +131,25 @@ static const uint16_t g_lcdconfig[NCOMMON_CONFIG] =
}; };
#define NLCD_CONFIG (sizeof(g_lcdconfig) / sizeof(uint16_t)) #define NLCD_CONFIG (sizeof(g_lcdconfig) / sizeof(uint16_t))
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_selectlcd * Name: stm32_selectlcd
* *
* Description: * Description:
* Initialize to the LCD pin configuration. * Initialize to the LCD pin configuration.
* *
************************************************************************************/ ****************************************************************************/
void stm32_selectlcd(void) void stm32_selectlcd(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/src/stm32_spi.c * boards/arm/stm32/fire-stm32v2/src/stm32_spi.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -53,17 +53,17 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the M3 Wildfire board. * Called to configure SPI chip select GPIO pins for the M3 Wildfire board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void) void weak_function stm32_spidev_initialize(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/fire-stm32v2/src/stm32_usbdev.c * boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -51,25 +51,25 @@
#include "stm32.h" #include "stm32.h"
#include "fire-stm32v2.h" #include "fire-stm32v2.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called to setup USB-related GPIO pins for the M3 Wildfire board. * Called to setup USB-related GPIO pins for the M3 Wildfire board.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usbinitialize(void) void stm32_usbinitialize(void)
{ {
@ -80,7 +80,7 @@ void stm32_usbinitialize(void)
#endif #endif
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_usbpullup * Name: stm32_usbpullup
* *
* Description: * Description:
@ -90,7 +90,7 @@ void stm32_usbinitialize(void)
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be * Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL. * NULL.
* *
************************************************************************************/ ****************************************************************************/
int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
{ {
@ -101,7 +101,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
return OK; return OK;
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_usbsuspend * Name: stm32_usbsuspend
* *
* Description: * Description:
@ -110,7 +110,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
* This is an opportunity for the board logic to shutdown clocks, power, etc. * This is an opportunity for the board logic to shutdown clocks, power, etc.
* while the USB is suspended. * while the USB is suspended.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/src/stm32_usbmsc.c * boards/arm/stm32/fire-stm32v2/src/stm32_usbmsc.c
* *
* Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/fire-stm32v2/src/stm32_userleds.c * boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
* *
* Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/fire-stm32v2/src/stm32_w25.c * boards/arm/stm32/fire-stm32v2/src/stm32_w25.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/include/board.h * boards/arm/stm32/hymini-stm32v/include/board.h
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2011 Laurent Latil. All rights reserved. * Copyright (C) 2011 Laurent Latil. All rights reserved.
@ -38,20 +38,20 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_HYMINI_STM32V_INCLUDE_BOARD_H
#define __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H #define __BOARDS_ARM_STM32_HYMINI_STM32V_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *************************************************************************/
@ -175,4 +175,4 @@
#define BUTTON_KEYA_BIT (1 << BUTTON_KEYA) #define BUTTON_KEYA_BIT (1 << BUTTON_KEYA)
#define BUTTON_KEYB_BIT (1 << BUTTON_KEYB) #define BUTTON_KEYB_BIT (1 << BUTTON_KEYB)
#endif /* __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_HYMINI_STM32V_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/hymini-stm32v/scripts/Make.defs # boards/arm/stm32/hymini-stm32v/scripts/Make.defs
# #
# Copyright (C) 2011, 2012, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2011, 2012, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/hymini-stm32v/scripts/ld.script * boards/arm/stm32/hymini-stm32v/scripts/ld.script
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/hymini-stm32v/src/Makefile # boards/arm/stm32/hymini-stm32v/src/Makefile
# #
# Copyright (C) 2009-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/hymini-stm32v.h * boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h
* *
* Copyright (C) 2009, 2011, 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,14 +32,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_HYMINI_STM32V_H #ifndef __BOARDS_ARM_STM32_HYMINI_STM32V_H
#define __BOARDS_ARM_HYMINI_STM32V_H #define __BOARDS_ARM_STM32_HYMINI_STM32V_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
@ -48,9 +48,9 @@
#include <arch/stm32/chip.h> #include <arch/stm32/chip.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
* modules (others may support more -- in such case, the following must be * modules (others may support more -- in such case, the following must be
@ -103,41 +103,41 @@
#define GPIO_SD_CD (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\ #define GPIO_SD_CD (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\
GPIO_PORTD|GPIO_PIN3) GPIO_PORTD|GPIO_PIN3)
/************************************************************************************ /****************************************************************************
* Public Types * Public Types
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public data * Public data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the Hy-Mini STM32v board. * Called to configure SPI chip select GPIO pins for the Hy-Mini STM32v board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_spidev_initialize(void); void weak_function stm32_spidev_initialize(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called to setup USB-related GPIO pins for the Hy-Mini STM32v board. * Called to setup USB-related GPIO pins for the Hy-Mini STM32v board.
* *
************************************************************************************/ ****************************************************************************/
void weak_function stm32_usbinitialize(void); void weak_function stm32_usbinitialize(void);
/************************************************************************************ /****************************************************************************
* Name: stm32_tsc_setup * Name: stm32_tsc_setup
* *
* Description: * Description:
@ -152,12 +152,12 @@ void weak_function stm32_usbinitialize(void);
* Zero is returned on success. Otherwise, a negated errno value is returned to * Zero is returned on success. Otherwise, a negated errno value is returned to
* indicate the nature of the failure. * indicate the nature of the failure.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_INPUT #ifdef CONFIG_INPUT
int stm32_tsc_setup(int minor); int stm32_tsc_setup(int minor);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_HYMINI_STM32V_H */ #endif /* __BOARDS_ARM_STM32_HYMINI_STM32V_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/hymini-stm32v/src/stm32_appinit.c * boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c
* *
* Copyright (C) 2009, 2011, 2016-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2016-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_boot.c * boards/arm/stm32/hymini-stm32v/src/stm32_boot.c
* *
* Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
@ -49,11 +49,11 @@
#include <arch/board/board.h> /* Should always be included last due to dependencies */ #include <arch/board/board.h> /* Should always be included last due to dependencies */
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
* Description: * Description:
@ -61,7 +61,7 @@
* is called early in the initialization -- after all memory has been configured * is called early in the initialization -- after all memory has been configured
* and mapped but before any devices have been initialized. * and mapped but before any devices have been initialized.
* *
************************************************************************************/ ****************************************************************************/
void stm32_boardinitialize(void) void stm32_boardinitialize(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/hymini-stm32v/src/stm32_buttons.c * boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c
* *
* Copyright (C) 2009, 2011, 2014-2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2014-2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/hymini-stm32v/src/stm32_leds.c * boards/arm/stm32/hymini-stm32v/src/stm32_leds.c
* *
* Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_r61505u.c * boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
* *
* Copyright (C) 2009, 2011, 2013, 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013, 2018 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org> * Authors: Gregory Nutt <gnutt@nuttx.org>
@ -34,11 +34,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************** /****************************************************************************
* Included Files * Included Files
**************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -60,9 +60,9 @@
#include <arch/board/board.h> /* Should always be included last due to dependencies */ #include <arch/board/board.h> /* Should always be included last due to dependencies */
/************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
**************************************************************************************/ ****************************************************************************/
#ifndef CONFIG_STM32_FSMC #ifndef CONFIG_STM32_FSMC
# error CONFIG_STM32_FSMC is required for LCD support # error CONFIG_STM32_FSMC is required for LCD support
@ -107,9 +107,9 @@
# define lcd_inline static # define lcd_inline static
#endif #endif
/************************************************************************************** /****************************************************************************
* Private Types * Private Types
**************************************************************************************/ ****************************************************************************/
struct mylcd_dev_s struct mylcd_dev_s
{ {
@ -122,9 +122,9 @@ struct mylcd_dev_s
uint8_t power; /* Current power setting */ uint8_t power; /* Current power setting */
}; };
/************************************************************************************** /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
**************************************************************************************/ ****************************************************************************/
/* Low Level methods */ /* Low Level methods */
@ -173,9 +173,9 @@ static void lcd_backlight(void);
# define lcd_backlight() # define lcd_backlight()
#endif #endif
/************************************************************************************** /****************************************************************************
* Private Data * Private Data
**************************************************************************************/ ****************************************************************************/
static const uint16_t fsmc_gpios[] = static const uint16_t fsmc_gpios[] =
{ {
@ -258,17 +258,17 @@ static struct mylcd_dev_s g_lcddev =
.power = 0 .power = 0
}; };
/************************************************************************************** /****************************************************************************
* Private Functions * Private Functions
**************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_extmemgpios * Name: stm32_extmemgpios
* *
* Description: * Description:
* Initialize GPIOs for NOR or SRAM * Initialize GPIOs for NOR or SRAM
* *
************************************************************************************/ ****************************************************************************/
static inline void stm32_extmemgpios(const uint16_t *gpios, int ngpios) static inline void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
{ {
@ -282,13 +282,13 @@ static inline void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
} }
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_selectlcd * Name: stm32_selectlcd
* *
* Description: * Description:
* Initialize to the LCD * Initialize to the LCD
* *
************************************************************************************/ ****************************************************************************/
static void stm32_selectlcd(void) static void stm32_selectlcd(void)
{ {
@ -321,13 +321,13 @@ static void stm32_selectlcd(void)
STM32_FSMC_BCR1); STM32_FSMC_BCR1);
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_deselectlcd * Name: stm32_deselectlcd
* *
* Description: * Description:
* Disable the LCD * Disable the LCD
* *
************************************************************************************/ ****************************************************************************/
static void stm32_deselectlcd(void) static void stm32_deselectlcd(void)
{ {
@ -344,36 +344,36 @@ static void stm32_deselectlcd(void)
stm32_fsmc_disable(); stm32_fsmc_disable();
} }
/************************************************************************************** /****************************************************************************
* Name: write_cmd * Name: write_cmd
**************************************************************************************/ ****************************************************************************/
lcd_inline void write_cmd(unsigned short cmd) lcd_inline void write_cmd(unsigned short cmd)
{ {
LCD_REG = cmd; LCD_REG = cmd;
} }
/************************************************************************************** /****************************************************************************
* Name: read_data * Name: read_data
**************************************************************************************/ ****************************************************************************/
lcd_inline unsigned short read_data(void) lcd_inline unsigned short read_data(void)
{ {
return LCD_RAM; return LCD_RAM;
} }
/************************************************************************************** /****************************************************************************
* Name: write_data * Name: write_data
**************************************************************************************/ ****************************************************************************/
lcd_inline void write_data(unsigned short data_code) lcd_inline void write_data(unsigned short data_code)
{ {
LCD_RAM = data_code; LCD_RAM = data_code;
} }
/************************************************************************************** /****************************************************************************
* Name: write_reg * Name: write_reg
**************************************************************************************/ ****************************************************************************/
static void write_reg(unsigned char reg_addr, unsigned short reg_val) static void write_reg(unsigned char reg_addr, unsigned short reg_val)
{ {
@ -381,9 +381,9 @@ static void write_reg(unsigned char reg_addr, unsigned short reg_val)
write_data(reg_val); write_data(reg_val);
} }
/************************************************************************************** /****************************************************************************
* Name: read_reg * Name: read_reg
**************************************************************************************/ ****************************************************************************/
static unsigned short read_reg(unsigned char reg_addr) static unsigned short read_reg(unsigned char reg_addr)
{ {
@ -393,18 +393,18 @@ static unsigned short read_reg(unsigned char reg_addr)
return (val); return (val);
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_gramselect * Name: lcd_gramselect
**************************************************************************************/ ****************************************************************************/
static inline void lcd_gramselect(void) static inline void lcd_gramselect(void)
{ {
write_cmd(0x22); write_cmd(0x22);
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_setcursor * Name: lcd_setcursor
**************************************************************************************/ ****************************************************************************/
static void lcd_setcursor(unsigned int x, unsigned int y) static void lcd_setcursor(unsigned int x, unsigned int y)
{ {
@ -425,7 +425,7 @@ static void lcd_setcursor(unsigned int x, unsigned int y)
#endif #endif
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_putrun * Name: lcd_putrun
* *
* Description: * Description:
@ -437,7 +437,7 @@ static void lcd_setcursor(unsigned int x, unsigned int y)
* npixels - The number of pixels to write to the LCD * npixels - The number of pixels to write to the LCD
* (range: 0 < npixels <= xres-col) * (range: 0 < npixels <= xres-col)
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, static int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
size_t npixels) size_t npixels)
@ -462,7 +462,7 @@ static int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_getrun * Name: lcd_getrun
* *
* Description: * Description:
@ -474,7 +474,7 @@ static int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
* npixels - The number of pixels to read from the LCD * npixels - The number of pixels to read from the LCD
* (range: 0 < npixels <= xres-col) * (range: 0 < npixels <= xres-col)
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, static int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
size_t npixels) size_t npixels)
@ -503,13 +503,13 @@ static int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_getvideoinfo * Name: lcd_getvideoinfo
* *
* Description: * Description:
* Get information about the LCD video controller configuration. * Get information about the LCD video controller configuration.
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev, static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo) FAR struct fb_videoinfo_s *vinfo)
@ -522,13 +522,13 @@ static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev,
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_getplaneinfo * Name: lcd_getplaneinfo
* *
* Description: * Description:
* Get information about the configuration of each LCD color plane. * Get information about the configuration of each LCD color plane.
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo) FAR struct lcd_planeinfo_s *pinfo)
@ -540,14 +540,14 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_getpower * Name: lcd_getpower
* *
* Description: * Description:
* Get the LCD panel power status (0: full off - CONFIG_LCD_MAXPOWER: full on). On * Get the LCD panel power status (0: full off - CONFIG_LCD_MAXPOWER: full on). On
* backlit LCDs, this setting may correspond to the backlight setting. * backlit LCDs, this setting may correspond to the backlight setting.
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_getpower(struct lcd_dev_s *dev) static int lcd_getpower(struct lcd_dev_s *dev)
{ {
@ -555,14 +555,14 @@ static int lcd_getpower(struct lcd_dev_s *dev)
return g_lcddev.power; return g_lcddev.power;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_setpower * Name: lcd_setpower
* *
* Description: * Description:
* Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on). * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on).
* Used here to set pwm duty on timer used for backlight. * Used here to set pwm duty on timer used for backlight.
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_setpower(struct lcd_dev_s *dev, int power) static int lcd_setpower(struct lcd_dev_s *dev, int power)
{ {
@ -609,13 +609,13 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_getcontrast * Name: lcd_getcontrast
* *
* Description: * Description:
* Get the current contrast setting (0-CONFIG_LCD_MAXCONTRAST). * Get the current contrast setting (0-CONFIG_LCD_MAXCONTRAST).
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_getcontrast(struct lcd_dev_s *dev) static int lcd_getcontrast(struct lcd_dev_s *dev)
{ {
@ -623,13 +623,13 @@ static int lcd_getcontrast(struct lcd_dev_s *dev)
return -ENOSYS; return -ENOSYS;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_setcontrast * Name: lcd_setcontrast
* *
* Description: * Description:
* Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST). * Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST).
* *
**************************************************************************************/ ****************************************************************************/
static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{ {
@ -637,13 +637,13 @@ static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
return -ENOSYS; return -ENOSYS;
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_lcdinitialize * Name: lcd_lcdinitialize
* *
* Description: * Description:
* Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST). * Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST).
* *
**************************************************************************************/ ****************************************************************************/
static inline void lcd_initialize(void) static inline void lcd_initialize(void)
{ {
@ -737,7 +737,7 @@ static inline void lcd_initialize(void)
up_mdelay(20); /* Delay 200 ms */ up_mdelay(20); /* Delay 200 ms */
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_backlight * Name: lcd_backlight
* *
* Description: * Description:
@ -745,7 +745,7 @@ static inline void lcd_initialize(void)
* CH2. TIM3 must then be configured to pwm output on PB.5; the duty * CH2. TIM3 must then be configured to pwm output on PB.5; the duty
* of the clock determines the backlight level. * of the clock determines the backlight level.
* *
**************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_LCD_BACKLIGHT #ifdef CONFIG_LCD_BACKLIGHT
@ -856,11 +856,11 @@ static void lcd_backlight(void)
} }
#endif #endif
/************************************************************************************** /****************************************************************************
* Public Functions * Public Functions
**************************************************************************************/ ****************************************************************************/
/************************************************************************************** /****************************************************************************
* Name: board_lcd_initialize * Name: board_lcd_initialize
* *
* Description: * Description:
@ -868,7 +868,7 @@ static void lcd_backlight(void)
* initialized, display memory cleared, and the LCD ready to use, but with the power * initialized, display memory cleared, and the LCD ready to use, but with the power
* setting at 0 (full off). * setting at 0 (full off).
* *
**************************************************************************************/ ****************************************************************************/
int board_lcd_initialize(void) int board_lcd_initialize(void)
{ {
@ -909,14 +909,14 @@ int board_lcd_initialize(void)
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: board_lcd_getdev * Name: board_lcd_getdev
* *
* Description: * Description:
* Return a a reference to the LCD object for the specified LCD. This allows support * Return a a reference to the LCD object for the specified LCD. This allows support
* for multiple LCD devices. * for multiple LCD devices.
* *
**************************************************************************************/ ****************************************************************************/
FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
{ {
@ -924,13 +924,13 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
return &g_lcddev.dev; return &g_lcddev.dev;
} }
/************************************************************************************** /****************************************************************************
* Name: board_lcd_uninitialize * Name: board_lcd_uninitialize
* *
* Description: * Description:
* Un-initialize the LCD support * Un-initialize the LCD support
* *
**************************************************************************************/ ****************************************************************************/
void board_lcd_uninitialize(void) void board_lcd_uninitialize(void)
{ {
@ -938,13 +938,13 @@ void board_lcd_uninitialize(void)
stm32_deselectlcd(); stm32_deselectlcd();
} }
/************************************************************************************** /****************************************************************************
* Name: lcd_clear * Name: lcd_clear
* *
* Description: * Description:
* Fill the LCD ctrl memory with given color * Fill the LCD ctrl memory with given color
* *
**************************************************************************************/ ****************************************************************************/
void lcd_clear(uint16_t color) void lcd_clear(uint16_t color)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_spi.c * boards/arm/stm32/hymini-stm32v/src/stm32_spi.c
* *
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -55,17 +55,17 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spidev_initialize * Name: stm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the HY-MiniSTM32 board. * Called to configure SPI chip select GPIO pins for the HY-MiniSTM32 board.
* *
************************************************************************************/ ****************************************************************************/
void stm32_spidev_initialize(void) void stm32_spidev_initialize(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_ssd1289.c * boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
* *
* Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,7 +32,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -56,9 +56,9 @@
#ifdef CONFIG_LCD_SSD1289 #ifdef CONFIG_LCD_SSD1289
/************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
**************************************************************************************/ ****************************************************************************/
/* Configuration **********************************************************************/ /* Configuration **********************************************************************/
@ -89,9 +89,9 @@
#define LCD_INDEX 0x60000000 /* RS = 0 */ #define LCD_INDEX 0x60000000 /* RS = 0 */
#define LCD_DATA 0x60020000 /* RS = 1 */ #define LCD_DATA 0x60020000 /* RS = 1 */
/************************************************************************************** /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
**************************************************************************************/ ****************************************************************************/
/* Low Level LCD access */ /* Low Level LCD access */
@ -106,9 +106,9 @@ static void stm32_backlight(FAR struct ssd1289_lcd_s *dev, int power);
static void stm32_extmemgpios(const uint16_t *gpios, int ngpios); static void stm32_extmemgpios(const uint16_t *gpios, int ngpios);
/************************************************************************************** /****************************************************************************
* Private Data * Private Data
**************************************************************************************/ ****************************************************************************/
const uint16_t fsmc_gpios[] = const uint16_t fsmc_gpios[] =
{ {
@ -153,56 +153,56 @@ static struct ssd1289_lcd_s g_ssd1289 =
static FAR struct lcd_dev_s *g_ssd1289drvr; static FAR struct lcd_dev_s *g_ssd1289drvr;
/************************************************************************************** /****************************************************************************
* Private Functions * Private Functions
**************************************************************************************/ ****************************************************************************/
/************************************************************************************** /****************************************************************************
* Name: stm32_select * Name: stm32_select
* *
* Description: * Description:
* Select the LCD device * Select the LCD device
* *
**************************************************************************************/ ****************************************************************************/
static void stm32_select(FAR struct ssd1289_lcd_s *dev) static void stm32_select(FAR struct ssd1289_lcd_s *dev)
{ {
/* Does not apply to this hardware */ /* Does not apply to this hardware */
} }
/************************************************************************************** /****************************************************************************
* Name: stm32_deselect * Name: stm32_deselect
* *
* Description: * Description:
* De-select the LCD device * De-select the LCD device
* *
**************************************************************************************/ ****************************************************************************/
static void stm32_deselect(FAR struct ssd1289_lcd_s *dev) static void stm32_deselect(FAR struct ssd1289_lcd_s *dev)
{ {
/* Does not apply to this hardware */ /* Does not apply to this hardware */
} }
/************************************************************************************** /****************************************************************************
* Name: stm32_index * Name: stm32_index
* *
* Description: * Description:
* Set the index register * Set the index register
* *
**************************************************************************************/ ****************************************************************************/
static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index) static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index)
{ {
putreg16((uint16_t)index, LCD_INDEX); putreg16((uint16_t)index, LCD_INDEX);
} }
/************************************************************************************** /****************************************************************************
* Name: stm32_read * Name: stm32_read
* *
* Description: * Description:
* Read LCD data (GRAM data or register contents) * Read LCD data (GRAM data or register contents)
* *
**************************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SSD1289_WRONLY #ifndef CONFIG_SSD1289_WRONLY
static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev) static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev)
@ -211,27 +211,27 @@ static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev)
} }
#endif #endif
/************************************************************************************** /****************************************************************************
* Name: stm32_write * Name: stm32_write
* *
* Description: * Description:
* Write LCD data (GRAM data or register contents) * Write LCD data (GRAM data or register contents)
* *
**************************************************************************************/ ****************************************************************************/
static void stm32_write(FAR struct ssd1289_lcd_s *dev, uint16_t data) static void stm32_write(FAR struct ssd1289_lcd_s *dev, uint16_t data)
{ {
putreg16((uint16_t)data, LCD_DATA); putreg16((uint16_t)data, LCD_DATA);
} }
/************************************************************************************** /****************************************************************************
* Name: stm32_backlight * Name: stm32_backlight
* *
* Description: * Description:
* Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on). * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on).
* Used here to set pwm duty on timer used for backlight. * Used here to set pwm duty on timer used for backlight.
* *
**************************************************************************************/ ****************************************************************************/
static void stm32_backlight(FAR struct ssd1289_lcd_s *dev, int power) static void stm32_backlight(FAR struct ssd1289_lcd_s *dev, int power)
{ {
@ -355,13 +355,13 @@ static void init_lcd_backlight(void)
lcdinfo("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR)); lcdinfo("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR));
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_selectlcd * Name: stm32_selectlcd
* *
* Description: * Description:
* Initialize the memory controller (FSMC) * Initialize the memory controller (FSMC)
* *
************************************************************************************/ ****************************************************************************/
static void stm32_selectlcd(void) static void stm32_selectlcd(void)
{ {
@ -394,13 +394,13 @@ static void stm32_selectlcd(void)
STM32_FSMC_BCR1); STM32_FSMC_BCR1);
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_extmemgpios * Name: stm32_extmemgpios
* *
* Description: * Description:
* Initialize GPIOs for NOR or SRAM * Initialize GPIOs for NOR or SRAM
* *
************************************************************************************/ ****************************************************************************/
static void stm32_extmemgpios(const uint16_t *gpios, int ngpios) static void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
{ {
@ -414,11 +414,11 @@ static void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
} }
} }
/************************************************************************************** /****************************************************************************
* Public Functions * Public Functions
**************************************************************************************/ ****************************************************************************/
/************************************************************************************** /****************************************************************************
* Name: board_lcd_initialize * Name: board_lcd_initialize
* *
* Description: * Description:
@ -426,7 +426,7 @@ static void stm32_extmemgpios(const uint16_t *gpios, int ngpios)
* initialized, display memory cleared, and the LCD ready to use, but with the power * initialized, display memory cleared, and the LCD ready to use, but with the power
* setting at 0 (full off). * setting at 0 (full off).
* *
**************************************************************************************/ ****************************************************************************/
int board_lcd_initialize(void) int board_lcd_initialize(void)
{ {
@ -459,14 +459,14 @@ int board_lcd_initialize(void)
return OK; return OK;
} }
/************************************************************************************** /****************************************************************************
* Name: board_lcd_getdev * Name: board_lcd_getdev
* *
* Description: * Description:
* Return a a reference to the LCD object for the specified LCD. This allows support * Return a a reference to the LCD object for the specified LCD. This allows support
* for multiple LCD devices. * for multiple LCD devices.
* *
**************************************************************************************/ ****************************************************************************/
FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
{ {
@ -474,13 +474,13 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
return g_ssd1289drvr; return g_ssd1289drvr;
} }
/************************************************************************************** /****************************************************************************
* Name: board_lcd_uninitialize * Name: board_lcd_uninitialize
* *
* Description: * Description:
* Uninitialize the LCD support * Uninitialize the LCD support
* *
**************************************************************************************/ ****************************************************************************/
void board_lcd_uninitialize(void) void board_lcd_uninitialize(void)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_ts.c * boards/arm/stm32/hymini-stm32v/src/stm32_ts.c
* *
* Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
@ -52,17 +52,17 @@
#include "stm32.h" #include "stm32.h"
#include "hymini-stm32v.h" #include "hymini-stm32v.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#if !defined(CONFIG_STM32_SPI1) #if !defined(CONFIG_STM32_SPI1)
# error CONFIG_STM32_SPI1 must be defined to use the ADS7843 on this board # error CONFIG_STM32_SPI1 must be defined to use the ADS7843 on this board
#endif #endif
/************************************************************************************ /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
************************************************************************************/ ****************************************************************************/
static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr);
static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state, static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state,
@ -71,9 +71,9 @@ static void hymini_ts_irq_clear(FAR struct ads7843e_config_s *state);
static bool hymini_ts_busy(FAR struct ads7843e_config_s *state); static bool hymini_ts_busy(FAR struct ads7843e_config_s *state);
static bool hymini_ts_pendown(FAR struct ads7843e_config_s *state); static bool hymini_ts_pendown(FAR struct ads7843e_config_s *state);
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
static FAR struct ads7843e_config_s ts_cfg = static FAR struct ads7843e_config_s ts_cfg =
{ {
@ -88,9 +88,9 @@ static FAR struct ads7843e_config_s ts_cfg =
static xcpt_t tc_isr; static xcpt_t tc_isr;
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/* Attach the ADS7843E interrupt handler to the GPIO interrupt */ /* Attach the ADS7843E interrupt handler to the GPIO interrupt */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/hymini-stm32v/src/stm32_usbdev.c * boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c
* *
* Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -51,25 +51,25 @@
#include "stm32.h" #include "stm32.h"
#include "hymini-stm32v.h" #include "hymini-stm32v.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_usbinitialize * Name: stm32_usbinitialize
* *
* Description: * Description:
* Called to setup USB-related GPIO pins for the Hy-Mini STM32v board. * Called to setup USB-related GPIO pins for the Hy-Mini STM32v board.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usbinitialize(void) void stm32_usbinitialize(void)
{ {
@ -79,7 +79,7 @@ void stm32_usbinitialize(void)
stm32_configgpio(GPIO_USB_PULLUP); stm32_configgpio(GPIO_USB_PULLUP);
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_usbpullup * Name: stm32_usbpullup
* *
* Description: * Description:
@ -89,7 +89,7 @@ void stm32_usbinitialize(void)
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be * Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL. * NULL.
* *
************************************************************************************/ ****************************************************************************/
int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
{ {
@ -98,7 +98,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
return OK; return OK;
} }
/************************************************************************************ /****************************************************************************
* Name: stm32_usbsuspend * Name: stm32_usbsuspend
* *
* Description: * Description:
@ -107,7 +107,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
* This is an opportunity for the board logic to shutdown clocks, power, etc. * This is an opportunity for the board logic to shutdown clocks, power, etc.
* while the USB is suspended. * while the USB is suspended.
* *
************************************************************************************/ ****************************************************************************/
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/hymini-stm32v/src/stm32_usbmsc.c * boards/arm/stm32/hymini-stm32v/src/stm32_usbmsc.c
* *
* Copyright (C) 2009, 2011, 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/maple/include/board.h * boards/arm/stm32/maple/include/board.h
* include/arch/board/board.h * include/arch/board/board.h
* *
* Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
@ -33,14 +33,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H #ifndef __BOARDS_ARM_STM32_MAPLE_INCLUDE_BOARD_H
#define __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H #define __BOARDS_ARM_STM32_MAPLE_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -50,9 +50,9 @@
#include "stm32_sdio.h" #include "stm32_sdio.h"
#include "stm32.h" #include "stm32.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *************************************************************************/
@ -162,4 +162,4 @@
#define LED_ASSERTION 6 /* LED1 + LED2 */ #define LED_ASSERTION 6 /* LED1 + LED2 */
#define LED_PANIC 7 /* LED1 / LED2 blinking */ #define LED_PANIC 7 /* LED1 / LED2 blinking */
#endif /* __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H */ #endif /* __BOARDS_ARM_STM32_MAPLE_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/maple/scripts/Make.defs # boards/arm/stm32/maple/scripts/Make.defs
# #
# Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/maple/scripts/ld.script * boards/arm/stm32/maple/scripts/ld.script
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/maple/scripts/ld.script.dfu * boards/arm/stm32/maple/scripts/ld.script.dfu
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

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