arch/stm32f7: Fix nxstyle errors

arch/arm/include/stm32f7/chip.h:
arch/arm/include/stm32f7/irq.h:
arch/arm/include/stm32f7/stm32f72xx73xx_irq.h:
arch/arm/include/stm32f7/stm32f74xx75xx_irq.h:
arch/arm/include/stm32f7/stm32f76xx77xx_irq.h:

    * Fix nxstyle errors.
This commit is contained in:
Nathan Hartman 2021-03-15 09:46:27 -04:00 committed by Alin Jerpelea
parent 45098769e7
commit 13816de7ac
5 changed files with 210 additions and 190 deletions

View File

@ -1,4 +1,4 @@
/************************************************************************************ /********************************************************************************************************************
* arch/arm/include/stm32f7/chip.h * arch/arm/include/stm32f7/chip.h
* *
* Copyright (C) 2015-2017 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
@ -33,20 +33,21 @@
* 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 __ARCH_ARM_INCLUDE_STM32F7_CHIP_H #ifndef __ARCH_ARM_INCLUDE_STM32F7_CHIP_H
#define __ARCH_ARM_INCLUDE_STM32F7_CHIP_H #define __ARCH_ARM_INCLUDE_STM32F7_CHIP_H
/************************************************************************************ /********************************************************************************************************************
* Included Files * Included Files
************************************************************************************/ ********************************************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/************************************************************************************ /********************************************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ********************************************************************************************************************/
/* STM32F722xx, STM32F723xx, /* STM32F722xx, STM32F723xx,
* STM32F745xx, STM32F746xx, STM32F756xx, STM32F765xx, STM32F767xx, STM32F768xx, * STM32F745xx, STM32F746xx, STM32F756xx, STM32F765xx, STM32F767xx, STM32F768xx,
* STM32F769xx, STM32F777xx and STM32F779xx Differences between family members: * STM32F769xx, STM32F777xx and STM32F779xx Differences between family members:
@ -373,7 +374,8 @@
#define STM32F7_NDFSDM 0 /* No Digital filters */ #define STM32F7_NDFSDM 0 /* No Digital filters */
#endif #endif
/* NVIC priority levels *************************************************************/ /* NVIC priority levels *********************************************************************************************/
/* 16 Programmable interrupt levels */ /* 16 Programmable interrupt levels */
#define NVIC_SYSH_PRIORITY_MIN 0xf0 /* All bits set in minimum priority */ #define NVIC_SYSH_PRIORITY_MIN 0xf0 /* All bits set in minimum priority */

View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* arch/arm/include/stm32f7/irq.h * arch/arm/include/stm32f7/irq.h
* *
* Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
@ -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.
* *
************************************************************************************/ ****************************************************************************/
/* This file should never be included directly but, rather, /* This file should never be included directly but, rather,
* only indirectly through nuttx/irq.h * only indirectly through nuttx/irq.h
@ -41,19 +41,19 @@
#ifndef __ARCH_ARM_INCLUDE_STM32F7_IRQ_H #ifndef __ARCH_ARM_INCLUDE_STM32F7_IRQ_H
#define __ARCH_ARM_INCLUDE_STM32F7_IRQ_H #define __ARCH_ARM_INCLUDE_STM32F7_IRQ_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to /* IRQ numbers. The IRQ number corresponds vector number and hence map
* bits in the NVIC. This does, however, waste several words of memory in the IRQ * directly to bits in the NVIC. This does, however, waste several words of
* to handle mapping tables. * memory in the IRQ to handle mapping tables.
*/ */
/* Processor Exceptions (vectors 0-15) */ /* Processor Exceptions (vectors 0-15) */
@ -73,10 +73,16 @@
#define STM32_IRQ_PENDSV (14) /* Vector 14: Pendable system service request */ #define STM32_IRQ_PENDSV (14) /* Vector 14: Pendable system service request */
#define STM32_IRQ_SYSTICK (15) /* Vector 15: System tick */ #define STM32_IRQ_SYSTICK (15) /* Vector 15: System tick */
/* External interrupts (vectors >= 16). These definitions are chip-specific */ /* External interrupts (vectors >= 16).
* These definitions are chip-specific
*/
#define STM32_IRQ_FIRST (16) /* Vector number of the first external interrupt */ #define STM32_IRQ_FIRST (16) /* Vector number of the first external interrupt */
/****************************************************************************
* Included Files
****************************************************************************/
#if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX) #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
# include <arch/stm32f7/stm32f72xx73xx_irq.h> # include <arch/stm32f7/stm32f72xx73xx_irq.h>
#elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
@ -87,13 +93,13 @@
# error "Unsupported STM32 F7 chip" # error "Unsupported STM32 F7 chip"
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Types * Public Types
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
@ -104,9 +110,9 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Functions * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1,4 +1,4 @@
/**************************************************************************************************** /****************************************************************************
* arch/arm/include/stm32f7/stm32f72xx73xx_irq.h * arch/arm/include/stm32f7/stm32f72xx73xx_irq.h
* *
* Copyright (C) 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
@ -33,31 +33,35 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
*Change Record: *Change Record:
* bf20171107 Created file. It's identical to stm32f74xx75xx_irq except for the * bf20171107 Created file. It's identical to stm32f74xx75xx_irq except for
* exclusions noted by this tag, and the addition of the last IRQ * the exclusions noted by this tag, and the addition of the
* for SDMMC2 (IRQ103). * last IRQ for SDMMC2 (IRQ103).
****************************************************************************************************/ ****************************************************************************/
/* This file should never be included directly but, rather, only indirectly through arch/irq.h */ /* This file should never be included directly but, rather, only indirectly
* through arch/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F72XX73XX_IRQ_H #ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F72XX73XX_IRQ_H
#define __ARCH_ARM_INCLUDE_STM32F7_STM32F72XX73XX_IRQ_H #define __ARCH_ARM_INCLUDE_STM32F7_STM32F72XX73XX_IRQ_H
/**************************************************************************************************** /****************************************************************************
* Included Files * Included Files
****************************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/**************************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************/
/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to bits in the /* IRQ numbers. The IRQ number corresponds vector number and hence map
* NVIC. This does, however, waste several words of memory in the IRQ to handle mapping tables. * directly to bits in the NVIC. This does, however, waste several words of
* memory in the IRQ to handle mapping tables.
* *
* Processor Exceptions (vectors 0-15). These common definitions can be found in the file * Processor Exceptions (vectors 0-15). These common definitions can be
* nuttx/arch/arm/include/stm32f7/irq.h which includes this file * found in the file nuttx/arch/arm/include/stm32f7/irq.h, which includes
* this file.
* *
* External interrupts (vectors >= 16) * External interrupts (vectors >= 16)
*/ */
@ -166,13 +170,13 @@
#define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS) #define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS)
/**************************************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************************************/ ****************************************************************************/
/**************************************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
@ -183,9 +187,9 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/**************************************************************************************************** /****************************************************************************
* Public Functions * Public Function Prototypes
****************************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1,4 +1,4 @@
/**************************************************************************************************** /****************************************************************************
* arch/arm/include/stm32f7/stm32f74xx75xx_irq.h * arch/arm/include/stm32f7/stm32f74xx75xx_irq.h
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
@ -31,28 +31,32 @@
* 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.
* *
****************************************************************************************************/ ****************************************************************************/
/* This file should never be included directly but, rather, only indirectly through arch/irq.h */ /* This file should never be included directly but, rather, only indirectly
* through arch/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F74XX75XX_IRQ_H #ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F74XX75XX_IRQ_H
#define __ARCH_ARM_INCLUDE_STM32F7_STM32F74XX75XX_IRQ_H #define __ARCH_ARM_INCLUDE_STM32F7_STM32F74XX75XX_IRQ_H
/**************************************************************************************************** /****************************************************************************
* Included Files * Included Files
****************************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/**************************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************/
/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to bits in the /* IRQ numbers. The IRQ number corresponds vector number and hence map
* NVIC. This does, however, waste several words of memory in the IRQ to handle mapping tables. * directly to bits in the NVIC. This does, however, waste several words of
* memory in the IRQ to handle mapping tables.
* *
* Processor Exceptions (vectors 0-15). These common definitions can be found in the file * Processor Exceptions (vectors 0-15). These common definitions can be
* nuttx/arch/arm/include/stm32f7/irq.h which includes this file * found in the file nuttx/arch/arm/include/stm32f7/irq.h, which includes
* this file
* *
* External interrupts (vectors >= 16) * External interrupts (vectors >= 16)
*/ */
@ -171,13 +175,13 @@
#define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS) #define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS)
/**************************************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************************************/ ****************************************************************************/
/**************************************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
@ -188,9 +192,9 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/**************************************************************************************************** /****************************************************************************
* Public Functions * Public Function Prototypes
****************************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1,4 +1,4 @@
/**************************************************************************************************** /****************************************************************************
* arch/arm/include/stm32f7/stm32f76xx77xx_irq.h * arch/arm/include/stm32f7/stm32f76xx77xx_irq.h
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
@ -32,28 +32,32 @@
* 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.
* *
****************************************************************************************************/ ****************************************************************************/
/* This file should never be included directly but, rather, only indirectly through arch/irq.h */ /* This file should never be included directly but, rather, only indirectly
* through arch/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F76XX77XX_IRQ_H #ifndef __ARCH_ARM_INCLUDE_STM32F7_STM32F76XX77XX_IRQ_H
#define __ARCH_ARM_INCLUDE_STM32F7_STM32F76XX77XX_IRQ_H #define __ARCH_ARM_INCLUDE_STM32F7_STM32F76XX77XX_IRQ_H
/**************************************************************************************************** /****************************************************************************
* Included Files * Included Files
****************************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/**************************************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************/
/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to bits in the /* IRQ numbers. The IRQ number corresponds vector number and hence map
* NVIC. This does, however, waste several words of memory in the IRQ to handle mapping tables. * directly to bits in the NVIC. This does, however, waste several words of
* memory in the IRQ to handle mapping tables.
* *
* Processor Exceptions (vectors 0-15). These common definitions can be found in the file * Processor Exceptions (vectors 0-15). These common definitions can be
* nuttx/arch/arm/include/stm32f7/irq.h which includes this file * found in the file nuttx/arch/arm/include/stm32f7/irq.h which includes
* this file
* *
* External interrupts (vectors >= 16) * External interrupts (vectors >= 16)
*/ */
@ -184,13 +188,13 @@
#define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS) #define NR_IRQS (STM32_IRQ_FIRST + STM32_IRQ_NEXTINTS)
/**************************************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************************************/ ****************************************************************************/
/**************************************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
@ -201,9 +205,9 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/**************************************************************************************************** /****************************************************************************
* Public Functions * Public Function Prototypes
****************************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus