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/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 9d50d180b1 Fix nuttx coding style
9d50d180b1 is described below
commit 9d50d180b15eb735c6ddd1863781bac7bbe9a84d
Author: simbit18 <101105604+simbi...@users.noreply.github.com>
AuthorDate: Wed Dec 13 14:36:43 2023 +0100
Fix nuttx coding style
Remove spaces
Remove extra */
---
arch/arm/include/at32/chip.h | 4 ++--
arch/arm/src/at32/hardware/at32_spi.h | 20 ++++++++++----------
arch/arm/src/at32/hardware/at32f43xxx_gpio.h | 2 +-
arch/arm/src/at32/hardware/at32f43xxx_rcc.h | 2 +-
arch/arm/src/efm32/hardware/efm32_letimer.h | 4 ++--
arch/arm/src/stm32/hardware/stm32_tim_v1v2.h | 2 +-
arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h | 2 +-
arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h | 2 +-
arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h | 2 +-
arch/arm/src/stm32h7/hardware/stm32_tim.h | 2 +-
arch/xtensa/src/esp32s3/esp32s3_wireless.c | 4 ++--
include/nuttx/sensors/ioctl.h | 2 +-
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/include/at32/chip.h b/arch/arm/include/at32/chip.h
index 46dc1093fa..11212d683b 100644
--- a/arch/arm/include/at32/chip.h
+++ b/arch/arm/include/at32/chip.h
@@ -86,7 +86,7 @@
#if defined(CONFIG_ARCH_CHIP_AT32F435RC) /* LQFP 64 10x10x1.4 256Kb FLASH
384Kb SRAM */
# define AT32_NFSMC 0 /* No FSMC */
# define AT32_NATIM 3 /* 3 advanced timers TIM1 and 8 */
-# define AT32_NGTIM 2 /* 32-bit general timers TIM2 and
5 with DMA */
+# define AT32_NGTIM 2 /* 32-bit general timers TIM2 and
5 with DMA */
# define AT32_NGTIMNDMA 8 /* 16-bit general timers TIM9-14
without DMA */
# define AT32_NBTIM 2 /* 2 basic timers, TIM6-7 */
# define AT32_NDMA 2 /* DMA1-2 */
@@ -434,7 +434,7 @@
#elif defined(CONFIG_ARCH_CHIP_AT32F437VM) /* LQFP-100 14x14x1.4 4032Kb FLASH
384Kb SRAM */
# define AT32_NFSMC 1 /* FSMC */
# define AT32_NATIM 3 /* Two advanced timers TIM1 and 8
*/
-# define AT32_NGTIM 2 /* 32-bit general timers TIM2 and
5 with DMA */
+# define AT32_NGTIM 2 /* 32-bit general timers TIM2 and
5 with DMA */
# define AT32_NGTIMNDMA 8 /* 16-bit general timers TIM9-14
without DMA */
# define AT32_NBTIM 2 /* Two basic timers, TIM6-7 */
# define AT32_NDMA 2 /* DMA1-2 */
diff --git a/arch/arm/src/at32/hardware/at32_spi.h
b/arch/arm/src/at32/hardware/at32_spi.h
index 2fa2567496..ddeae07693 100644
--- a/arch/arm/src/at32/hardware/at32_spi.h
+++ b/arch/arm/src/at32/hardware/at32_spi.h
@@ -128,16 +128,16 @@
#define SPI_CTRL1_MDIV_SHIFT (3) /* Master clock frequency division */
#define SPI_CTRL1_MDIV_MASK (7 << SPI_CTRL1_MDIV_SHIFT)
-# define SPI_CTRL1_MDIV_2 (0 << SPI_CTRL1_MDIV_SHIFT) /* Div 2 */
-# define SPI_CTRL1_MDIV_4 (1 << SPI_CTRL1_MDIV_SHIFT) /* Div 4 */
-# define SPI_CTRL1_MDIV_8 (2 << SPI_CTRL1_MDIV_SHIFT) /* Div 8 */
-# define SPI_CTRL1_MDIV_16 (3 << SPI_CTRL1_MDIV_SHIFT) /* Div 16 */
-# define SPI_CTRL1_MDIV_32 (4 << SPI_CTRL1_MDIV_SHIFT) /* Div 32 */
-# define SPI_CTRL1_MDIV_64 (5 << SPI_CTRL1_MDIV_SHIFT) /* Div 64 */
-# define SPI_CTRL1_MDIV_128 (6 << SPI_CTRL1_MDIV_SHIFT) /* Div 128 */
-# define SPI_CTRL1_MDIV_256 (7 << SPI_CTRL1_MDIV_SHIFT) /* Div 256 */
-# define SPI_CTRL1_MDIV_512 (8 << SPI_CTRL1_MDIV_SHIFT) /* Div 512 */
-# define SPI_CTRL1_MDIV_1024 (9 << SPI_CTRL1_MDIV_SHIFT) /* Div 1024 */
+# define SPI_CTRL1_MDIV_2 (0 << SPI_CTRL1_MDIV_SHIFT) /* Div 2 */
+# define SPI_CTRL1_MDIV_4 (1 << SPI_CTRL1_MDIV_SHIFT) /* Div 4 */
+# define SPI_CTRL1_MDIV_8 (2 << SPI_CTRL1_MDIV_SHIFT) /* Div 8 */
+# define SPI_CTRL1_MDIV_16 (3 << SPI_CTRL1_MDIV_SHIFT) /* Div 16 */
+# define SPI_CTRL1_MDIV_32 (4 << SPI_CTRL1_MDIV_SHIFT) /* Div 32 */
+# define SPI_CTRL1_MDIV_64 (5 << SPI_CTRL1_MDIV_SHIFT) /* Div 64 */
+# define SPI_CTRL1_MDIV_128 (6 << SPI_CTRL1_MDIV_SHIFT) /* Div 128 */
+# define SPI_CTRL1_MDIV_256 (7 << SPI_CTRL1_MDIV_SHIFT) /* Div 256 */
+# define SPI_CTRL1_MDIV_512 (8 << SPI_CTRL1_MDIV_SHIFT) /* Div 512 */
+# define SPI_CTRL1_MDIV_1024 (9 << SPI_CTRL1_MDIV_SHIFT) /* Div 1024 */
#define SPI_CTRL1_SPIEN (1 << 6) /* SPI enable */
#define SPI_CTRL1_LTF (1 << 7) /* LSB transmit first */
diff --git a/arch/arm/src/at32/hardware/at32f43xxx_gpio.h
b/arch/arm/src/at32/hardware/at32f43xxx_gpio.h
index c72a641059..697bbafafd 100644
--- a/arch/arm/src/at32/hardware/at32f43xxx_gpio.h
+++ b/arch/arm/src/at32/hardware/at32f43xxx_gpio.h
@@ -40,7 +40,7 @@
#define AT32_GPIO_MUXL_OFFSET (0x20) /* GPIO muxing register
(pin0~7) */
#define AT32_GPIO_MUXH_OFFSET (0x24) /* GPIO muxing register
(pin8~15)*/
#define AT32_GPIO_CLR_OFFSET (0x28) /* GPIO clear bit */
-#define AT32_GPIO_HDRV_OFFSET (0x3C) /* GPIO high driver */
+#define AT32_GPIO_HDRV_OFFSET (0x3C) /* GPIO high driver */
/* Register Addresses *******************************************************/
diff --git a/arch/arm/src/at32/hardware/at32f43xxx_rcc.h
b/arch/arm/src/at32/hardware/at32f43xxx_rcc.h
index ad32801fb9..1eea60deb2 100644
--- a/arch/arm/src/at32/hardware/at32f43xxx_rcc.h
+++ b/arch/arm/src/at32/hardware/at32f43xxx_rcc.h
@@ -102,7 +102,7 @@
#define CRM_PLL_CFG_PLL_NS_MASK (0x1FF << CRM_PLL_CFG_PLL_NS_SHIFT)
# define CRM_PLL_CFG_PLL_NS(n) ((n) << CRM_PLL_CFG_PLL_NS_SHIFT) /* n
= 31..500 */
-#define CRM_PLL_CFG_PLL_FR_SHIFT (16) /* PLL post-division */
+#define CRM_PLL_CFG_PLL_FR_SHIFT (16) /* PLL post-division */
#define CRM_PLL_CFG_PLL_FR_MASK (7 << CRM_PLL_CFG_PLL_FR_SHIFT)
# define CRM_PLL_CFG_PLL_FR_1 (0 << CRM_PLL_CFG_PLL_FR_SHIFT) /* div
1 */
# define CRM_PLL_CFG_PLL_FR_2 (1 << CRM_PLL_CFG_PLL_FR_SHIFT) /* div
2 */
diff --git a/arch/arm/src/efm32/hardware/efm32_letimer.h
b/arch/arm/src/efm32/hardware/efm32_letimer.h
index 5fa36f2558..0ade6b0545 100644
--- a/arch/arm/src/efm32/hardware/efm32_letimer.h
+++ b/arch/arm/src/efm32/hardware/efm32_letimer.h
@@ -82,8 +82,8 @@
#define EFM32_LETIMER_CMD_OFFSET 0x0004 /* Command Register */
#define EFM32_LETIMER_STATUS_OFFSET 0x0008 /* Status Register */
#define EFM32_LETIMER_CNT_OFFSET 0x000c /* Counter Value Register
*/
-#define EFM32_LETIMER_COMP0_OFFSET 0x0010 /* Compare Value Register
*/ 0
-#define EFM32_LETIMER_COMP1_OFFSET 0x0014 /* Compare Value Register
*/ 1
+#define EFM32_LETIMER_COMP0_OFFSET 0x0010 /* Compare Value Register
0 */
+#define EFM32_LETIMER_COMP1_OFFSET 0x0014 /* Compare Value Register
1 */
#define EFM32_LETIMER_REP0_OFFSET 0x0018 /* Repeat Counter
Register 0 */
#define EFM32_LETIMER_REP1_OFFSET 0x001c /* Repeat Counter
Register 1 */
#define EFM32_LETIMER_IF_OFFSET 0x0020 /* Interrupt Flag
Register */
diff --git a/arch/arm/src/stm32/hardware/stm32_tim_v1v2.h
b/arch/arm/src/stm32/hardware/stm32_tim_v1v2.h
index a1ffa58776..5609fd0c11 100644
--- a/arch/arm/src/stm32/hardware/stm32_tim_v1v2.h
+++ b/arch/arm/src/stm32/hardware/stm32_tim_v1v2.h
@@ -867,7 +867,7 @@
# define ATIM_BDTR_LOCKOFF (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK
OFF - No bit is write protected */
# define ATIM_BDTR_LOCK1 (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK
Level 1 protection */
# define ATIM_BDTR_LOCK2 (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK
Level 2 protection */
-# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */ */
+# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */
#define ATIM_BDTR_OSSI (1 << 10) /* Bit 10:
Off-State Selection for Idle mode */
#define ATIM_BDTR_OSSR (1 << 11) /* Bit 11:
Off-State Selection for Run mode */
#define ATIM_BDTR_BKE (1 << 12) /* Bit 12:
Break enable */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
index a0266da3bb..eb40a0bc8a 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
@@ -725,7 +725,7 @@
# define ATIM_BDTR_LOCKOFF (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF
- No bit is write protected */
# define ATIM_BDTR_LOCK1 (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK
Level 1 protection */
# define ATIM_BDTR_LOCK2 (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK
Level 2 protection */
-# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */ */
+# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */
#define ATIM_BDTR_OSSI (1 << 10) /* Bit 10: Off-State Selection for
Idle mode */
#define ATIM_BDTR_OSSR (1 << 11) /* Bit 11: Off-State Selection for
Run mode */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
index 0cc21659e6..2c54ca9aff 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
@@ -727,7 +727,7 @@
# define ATIM_BDTR_LOCKOFF (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF
- No bit is write protected */
# define ATIM_BDTR_LOCK1 (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK
Level 1 protection */
# define ATIM_BDTR_LOCK2 (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK
Level 2 protection */
-# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */ */
+# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */
#define ATIM_BDTR_OSSI (1 << 10) /* Bit 10: Off-State Selection for
Idle mode */
#define ATIM_BDTR_OSSR (1 << 11) /* Bit 11: Off-State Selection for
Run mode */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
index 947ceaffd6..32bdf8d7a3 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
@@ -745,7 +745,7 @@
# define ATIM_BDTR_LOCKOFF (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF
- No bit is write protected */
# define ATIM_BDTR_LOCK1 (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK
Level 1 protection */
# define ATIM_BDTR_LOCK2 (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK
Level 2 protection */
-# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */ */
+# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */
#define ATIM_BDTR_OSSI (1 << 10) /* Bit 10: Off-State Selection for
Idle mode */
#define ATIM_BDTR_OSSR (1 << 11) /* Bit 11: Off-State Selection for
Run mode */
diff --git a/arch/arm/src/stm32h7/hardware/stm32_tim.h
b/arch/arm/src/stm32h7/hardware/stm32_tim.h
index a33bd09664..fa4d583949 100644
--- a/arch/arm/src/stm32h7/hardware/stm32_tim.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_tim.h
@@ -763,7 +763,7 @@
# define ATIM_BDTR_LOCKOFF (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF
- No bit is write protected */
# define ATIM_BDTR_LOCK1 (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK
Level 1 protection */
# define ATIM_BDTR_LOCK2 (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK
Level 2 protection */
-# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */ */
+# define ATIM_BDTR_LOCK3 (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK
Level 3 protection */
#define ATIM_BDTR_OSSI (1 << 10) /* Bit 10: Off-State Selection for
Idle mode */
#define ATIM_BDTR_OSSR (1 << 11) /* Bit 11: Off-State Selection for
Run mode */
diff --git a/arch/xtensa/src/esp32s3/esp32s3_wireless.c
b/arch/xtensa/src/esp32s3/esp32s3_wireless.c
index 9da89df749..d507d15031 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_wireless.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_wireless.c
@@ -784,7 +784,7 @@ const esp_phy_init_data_t *esp_phy_get_init_data(void)
kmm_free(init_data_store);
return NULL;
}
-#else /* CONFIG_ESP32S3_PHY_DEFAULT_INIT_IF_INVALID */
+#else /* CONFIG_ESP32S3_PHY_DEFAULT_INIT_IF_INVALID */
wlerr("ERROR: Failed to validate PHY data partition\n");
kmm_free(init_data_store);
return NULL;
@@ -828,7 +828,7 @@ void esp_phy_release_init_data(const esp_phy_init_data_t
*init_data)
kmm_free((uint8_t *)init_data - sizeof(phy_init_magic_pre));
}
-#else /* CONFIG_ESP32S3_PHY_INIT_DATA_IN_PARTITION */
+#else /* CONFIG_ESP32S3_PHY_INIT_DATA_IN_PARTITION */
/****************************************************************************
* Name: esp_phy_get_init_data
diff --git a/include/nuttx/sensors/ioctl.h b/include/nuttx/sensors/ioctl.h
index 6e7c5dd055..48a77d903d 100644
--- a/include/nuttx/sensors/ioctl.h
+++ b/include/nuttx/sensors/ioctl.h
@@ -364,7 +364,7 @@
/* Set proximity sensor cancellation level */
-#define SNIOC_PS_CANC_LVL _SNIOC(0x0095) /* uint16_t level */
+#define SNIOC_PS_CANC_LVL _SNIOC(0x0095) /* uint16_t level */
/* IOCTL commands for MPU60x0 IMU */
