This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 080b2df arch/stm32: Fix nxstyle errors
080b2df is described below
commit 080b2dfcebebb4ae01cd39d81fe62132d1380aa2
Author: Nathan Hartman <59230071+hartmannat...@users.noreply.github.com>
AuthorDate: Thu Dec 24 16:06:51 2020 -0500
arch/stm32: Fix nxstyle errors
arch/arm/src/stm32/stm32_exti.h:
arch/arm/src/stm32/stm32_flash.c:
arch/arm/src/stm32/stm32_fsmc.c:
arch/arm/src/stm32/stm32_fsmc.h:
arch/arm/src/stm32/stm32_hciuart.h:
arch/arm/src/stm32/stm32_mpuinit.h:
arch/arm/src/stm32/stm32_rtc.c:
* Fix nxstyle issues.
---
arch/arm/src/stm32/stm32_exti.h | 28 ++++++++++++++--------------
arch/arm/src/stm32/stm32_flash.c | 16 ++++++++++------
arch/arm/src/stm32/stm32_fsmc.c | 12 ++++++------
arch/arm/src/stm32/stm32_fsmc.h | 14 +++++++-------
arch/arm/src/stm32/stm32_hciuart.h | 3 ++-
arch/arm/src/stm32/stm32_mpuinit.h | 26 +++++++++++++-------------
arch/arm/src/stm32/stm32_rtc.c | 23 ++++++++++++-----------
7 files changed, 64 insertions(+), 58 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_exti.h b/arch/arm/src/stm32/stm32_exti.h
index 12d469d..4848df5 100644
--- a/arch/arm/src/stm32/stm32_exti.h
+++ b/arch/arm/src/stm32/stm32_exti.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/stm32/stm32_exti.h
*
* Copyright (C) 2009, 2012, 2015, 2017 Gregory Nutt. All rights reserved.
@@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-
************************************************************************************/
+ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_STM32_EXTI_H
#define __ARCH_ARM_SRC_STM32_STM32_EXTI_H
-/************************************************************************************
+/****************************************************************************
* Included Files
-
************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
@@ -47,9 +47,9 @@
#include "chip.h"
#include "hardware/stm32_exti.h"
-/************************************************************************************
+/****************************************************************************
* Public Data
-
************************************************************************************/
+ ****************************************************************************/
#ifndef __ASSEMBLY__
@@ -62,11 +62,11 @@ extern "C"
#define EXTERN extern
#endif
-/************************************************************************************
+/****************************************************************************
* Public Function Prototypes
-
************************************************************************************/
+ ****************************************************************************/
-/************************************************************************************
+/****************************************************************************
* Name: stm32_gpiosetevent
*
* Description:
@@ -83,12 +83,12 @@ extern "C"
* Zero (OK) on success; a negated errno value on failure indicating the
* nature of the failure.
*
-
************************************************************************************/
+ ****************************************************************************/
int stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
bool event, xcpt_t func, void *arg);
-/************************************************************************************
+/****************************************************************************
* Name: stm32_exti_alarm
*
* Description:
@@ -104,11 +104,11 @@ int stm32_gpiosetevent(uint32_t pinset, bool risingedge,
bool fallingedge,
* Zero (OK) on success; a negated errno value on failure indicating the
* nature of the failure.
*
-
************************************************************************************/
+ ****************************************************************************/
#ifdef CONFIG_RTC_ALARM
-int stm32_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t
func,
- void *arg);
+int stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
+ xcpt_t func, void *arg);
#endif
/****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_flash.c b/arch/arm/src/stm32/stm32_flash.c
index f9ec357..4f70e8a 100644
--- a/arch/arm/src/stm32/stm32_flash.c
+++ b/arch/arm/src/stm32/stm32_flash.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/stm32/stm32_flash.c
*
* Copyright (C) 2011 Uros Platise. All rights reserved.
@@ -31,15 +31,15 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-
************************************************************************************/
+ ****************************************************************************/
-/* Provides standard flash access functions, to be used by the flash mtd
driver.
- * The interface is defined in the include/nuttx/progmem.h
+/* Provides standard flash access functions, to be used by the flash mtd
+ * driver. The interface is defined in the include/nuttx/progmem.h
*/
-/************************************************************************************
+/****************************************************************************
* Included Files
-
************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
@@ -54,3 +54,7 @@
#else
# warning "No FLASH support for the selected part"
#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
diff --git a/arch/arm/src/stm32/stm32_fsmc.c b/arch/arm/src/stm32/stm32_fsmc.c
index a7f57c1..93fd9cd 100644
--- a/arch/arm/src/stm32/stm32_fsmc.c
+++ b/arch/arm/src/stm32/stm32_fsmc.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/stm32/stm32_fsmc.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
@@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-
************************************************************************************/
+ ****************************************************************************/
-/************************************************************************************
+/****************************************************************************
* Included Files
-
************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
@@ -43,9 +43,9 @@
#if defined(CONFIG_STM32_FSMC)
-/************************************************************************************
+/****************************************************************************
* Public Functions
-
************************************************************************************/
+ ****************************************************************************/
/****************************************************************************
* Name: stm32_fsmc_enable
diff --git a/arch/arm/src/stm32/stm32_fsmc.h b/arch/arm/src/stm32/stm32_fsmc.h
index 441f326..620ace3 100644
--- a/arch/arm/src/stm32/stm32_fsmc.h
+++ b/arch/arm/src/stm32/stm32_fsmc.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/stm32/stm32_fsmc.h
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
@@ -31,23 +31,23 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-
************************************************************************************/
+ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_STM32_FSMC_H
#define __ARCH_ARM_SRC_STM32_STM32_FSMC_H
-/************************************************************************************
+/****************************************************************************
* Included Files
-
************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
#include "chip.h"
#include "hardware/stm32_fsmc.h"
-/************************************************************************************
- * Public Functions
-
************************************************************************************/
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
#ifndef __ASSEMBLY__
diff --git a/arch/arm/src/stm32/stm32_hciuart.h
b/arch/arm/src/stm32/stm32_hciuart.h
index c0806ba..f074d6b 100644
--- a/arch/arm/src/stm32/stm32_hciuart.h
+++ b/arch/arm/src/stm32/stm32_hciuart.h
@@ -77,7 +77,8 @@ enum hciuart_devno_e
*
****************************************************************************/
-const struct btuart_lowerhalf_s *hciuart_instantiate(enum hciuart_devno_e
uart);
+const struct btuart_lowerhalf_s *
+hciuart_instantiate(enum hciuart_devno_e uart);
/****************************************************************************
* Name: hciuart_initialize
diff --git a/arch/arm/src/stm32/stm32_mpuinit.h
b/arch/arm/src/stm32/stm32_mpuinit.h
index 6d76db4..0814dd5 100644
--- a/arch/arm/src/stm32/stm32_mpuinit.h
+++ b/arch/arm/src/stm32/stm32_mpuinit.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/stm32/stm32_mpuinit.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
@@ -31,32 +31,32 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
-
************************************************************************************/
+ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_STM32_MPUINIT_H
#define __ARCH_ARM_SRC_STM32_STM32_MPUINIT_H
-/************************************************************************************
+/****************************************************************************
* Included Files
-
************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
-/************************************************************************************
+/****************************************************************************
* Pre-processor Definitions
-
************************************************************************************/
+ ****************************************************************************/
-/************************************************************************************
+/****************************************************************************
* Public Types
-
************************************************************************************/
+ ****************************************************************************/
-/************************************************************************************
+/****************************************************************************
* Public Data
-
************************************************************************************/
+ ****************************************************************************/
-/************************************************************************************
- * Public Functions
-
************************************************************************************/
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
/****************************************************************************
* Name: stm32_mpuinitialize
diff --git a/arch/arm/src/stm32/stm32_rtc.c b/arch/arm/src/stm32/stm32_rtc.c
index f78e2b3..5994afc 100644
--- a/arch/arm/src/stm32/stm32_rtc.c
+++ b/arch/arm/src/stm32/stm32_rtc.c
@@ -41,14 +41,11 @@
#include "chip.h"
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/* This file is only a thin shell that includes the correct RTC implementation
- * for the selected STM32 family. The correct file cannot be selected by
- * the make system because it needs the intelligence that only exists in
- * chip.h that can associate an STM32 part number with an STM32 family.
+/* This file is only a thin shell that includes the correct RTC
+ * implementation for the selected STM32 family. The correct file cannot be
+ * selected by the make system because it needs the intelligence that only
+ * exists in chip.h that can associate an STM32 part number with an STM32
+ * family.
*/
/* The STM32 F1 has a simple battery-backed counter for its RTC and has a
@@ -58,9 +55,9 @@
#if defined(CONFIG_STM32_STM32F10XX)
# include "stm32_rtcounter.c"
-/* The other families use a more traditional Realtime Clock/Calendar (RTCC)
with
- * broken-out data/time in BCD format. The backup registers are integrated
into
- * the RTCC in these families.
+/* The other families use a more traditional Realtime Clock/Calendar (RTCC)
+ * with broken-out data/time in BCD format. The backup registers are
+ * integrated into the RTCC in these families.
*/
#elif defined(CONFIG_STM32_STM32F20XX) || \
@@ -71,3 +68,7 @@
#elif defined(CONFIG_STM32_STM32F4XXX)
# include "stm32f40xxx_rtcc.c"
#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
