You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/05/14 06:33:02 UTC
[incubator-nuttx] 02/23: nxstyle fixes
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cf8206a0cb9dbaf96114a0cee61fe5086e49f613
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Fri May 8 12:03:43 2020 -0300
nxstyle fixes
---
.../arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h | 5 +++--
boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c | 9 +++++----
boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c | 9 +++++----
.../arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h | 15 +++++++++------
boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c | 7 +++++--
boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h | 12 ++++++------
6 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
index d6b84e2..512cdd9 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
+++ b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -112,7 +112,8 @@
* Pre-processor Definitions
****************************************************************************/
-/* Olimex-STM32-E407 GPIOs ****************************************************/
+/* Olimex-STM32-E407 GPIOs **************************************************/
+
/* LEDs */
#define GPIO_LED_STATUS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
@@ -221,7 +222,7 @@
#ifndef __ASSEMBLY__
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
/****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
index 8dde27f..16e6453 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c
@@ -202,8 +202,8 @@ int stm32_bringup(void)
#endif
#ifdef HAVE_USBHOST
- /* Initialize USB host operation. stm32_usbhost_initialize() starts a thread
- * will monitor for USB connection and disconnection events.
+ /* Initialize USB host operation. stm32_usbhost_initialize() starts a
+ * thread will monitor for USB connection and disconnection events.
*/
ret = stm32_usbhost_initialize();
@@ -256,7 +256,7 @@ int stm32_bringup(void)
#endif
#if defined(CONFIG_TIMER)
- /*Initialize the timer, at this moment it's only Timer 1,2,3*/
+ /* Initialize the timer, at this moment it's only Timer 1,2,3 */
#if defined(CONFIG_STM32_TIM1)
stm32_timer_driver_setup("/dev/timer1", 1);
@@ -275,7 +275,8 @@ int stm32_bringup(void)
ret = stm32_mrf24j40_initialize();
if (ret < 0)
{
- syslog(LOG_ERR, "ERROR: stm32_mrf24j40_initialize() failed: %d\n", ret);
+ syslog(LOG_ERR, "ERROR: stm32_mrf24j40_initialize() failed:"
+ " %d\n", ret);
}
#endif
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
index a3ee67d..03bfa35 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
@@ -73,9 +73,9 @@
#include "stm32f103_minimum.h"
-/* Conditional logic in stm32f103_minimum.h will determine if certain features
- * are supported. Tests for these features need to be made after including
- * stm32f103_minimum.h.
+/* Conditional logic in stm32f103_minimum.h will determine if certain
+ * features are supported. Tests for these features need to be made after
+ * including stm32f103_minimum.h.
*/
#ifdef HAVE_RTC_DRIVER
@@ -358,7 +358,8 @@ int stm32_bringup(void)
#ifdef CONFIG_SENSORS_QENCODER
/* Initialize and register the qencoder driver */
- ret = stm32_qencoder_initialize("/dev/qe0", CONFIG_STM32F103MINIMUM_QETIMER);
+ ret = stm32_qencoder_initialize("/dev/qe0",
+ CONFIG_STM32F103MINIMUM_QETIMER);
if (ret != OK)
{
syslog(LOG_ERR,
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h
index 2490703..b9a07d3 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h
@@ -105,7 +105,8 @@
# undef CONFIG_STM32_SPI2
#endif
-/* GPIOs **************************************************************/
+/* GPIOs ********************************************************************/
+
/* LEDs */
/* The Blue/Red pills have a different pinout to the Black pill,
@@ -220,7 +221,7 @@
#define GPIO_INT1 (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_PORTA|GPIO_PIN2)
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
#ifndef __ASSEMBLY__
@@ -297,7 +298,8 @@ int stm32_apds9960initialize(FAR const char *devpath);
* Name: stm32_spidev_initialize
*
* 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.
*
****************************************************************************/
@@ -495,7 +497,8 @@ int stm32_mfrc522initialize(FAR const char *devpath);
* Name: stm32_tone_setup
*
* Description:
- * Function used to initialize a PWM and Oneshot timers to Audio Tone Generator.
+ * Function used to initialize a PWM and Oneshot timers to Audio Tone
+ * Generator.
*
****************************************************************************/
@@ -507,8 +510,8 @@ int stm32_tone_setup(void);
* Name: stm32_veml6070initialize
*
* Description:
- * Called to configure an I2C and to register VEML6070 for the stm32f103-minimum
- * board.
+ * Called to configure an I2C and to register VEML6070 for the
+ * stm32f103-minimum board.
*
****************************************************************************/
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
index aa4b324..98903cc 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c
@@ -443,7 +443,9 @@ int stm32_bringup(void)
#endif
#ifdef CONFIG_STM32F4DISCO_LIS3DSH
- /* Create a lis3dsh driver instance fitting the chip built into stm32f4discovery */
+ /* Create a lis3dsh driver instance fitting the chip built into
+ * stm32f4discovery
+ */
ret = stm32_lis3dshinitialize("/dev/acc0");
if (ret < 0)
@@ -483,7 +485,8 @@ int stm32_bringup(void)
ret = stm32_lpwaninitialize();
if (ret < 0)
{
- syslog(LOG_ERR, "ERROR: Failed to initialize wireless driver: %d\n", ret);
+ syslog(LOG_ERR, "ERROR: Failed to initialize wireless driver:"
+ " %d\n", ret);
}
#endif /* CONFIG_LPWAN_SX127X */
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
index 6204e62..bfb7fe1 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
@@ -111,8 +111,8 @@
# undef HAVE_USBMONITOR
#endif
-/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
- * is not enabled.
+/* Can't support MMC/SD features if mountpoints are disabled or if SDIO
+ * support is not enabled.
*/
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO)
@@ -251,8 +251,8 @@
/* PWM
*
- * The STM32F4 Discovery has no real on-board PWM devices, but the board can be
- * configured to output a pulse train using TIM4 CH2 on PD13.
+ * The STM32F4 Discovery has no real on-board PWM devices, but the board can
+ * be configured to output a pulse train using TIM4 CH2 on PD13.
*/
#define STM32F4DISCOVERY_PWMTIMER 4
@@ -739,8 +739,8 @@ int stm32_max31855initialize(FAR const char *devpath, int bus,
* Name: stm32_mlx90614init
*
* Description:
- * Called to configure an I2C and to register MLX90614 for the stm32f103-minimum
- * board.
+ * Called to configure an I2C and to register MLX90614 for the
+ * stm32f103-minimum board.
*
****************************************************************************/