Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cosmetic: Move # of pre-processior command to column 1

Browse Source
This commit is contained in:
Gregory Nutt
2015-09-05 09:07:37 -06:00
parent 2ed09233d3
commit 975d912b40
30 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/c5471/c5471_ethernet.c
+1 -1
View File
@@ -2240,7 +2240,7 @@ void up_netinitialize(void)
g_c5471[0].c_dev.d_ifup = c5471_ifup; /* I/F down callback */ g_c5471[0].c_dev.d_ifup = c5471_ifup; /* I/F down callback */
g_c5471[0].c_dev.d_ifdown = c5471_ifdown; /* I/F up (new IP address) callback */ g_c5471[0].c_dev.d_ifdown = c5471_ifdown; /* I/F up (new IP address) callback */
g_c5471[0].c_dev.d_txavail = c5471_txavail; /* New TX data callback */ g_c5471[0].c_dev.d_txavail = c5471_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP #ifdef CONFIG_NET_IGMP
g_c5471[0].c_dev.d_addmac = c5471_addmac; /* Add multicast MAC address */ g_c5471[0].c_dev.d_addmac = c5471_addmac; /* Add multicast MAC address */
g_c5471[0].c_dev.d_rmmac = c5471_rmmac; /* Remove multicast MAC address */ g_c5471[0].c_dev.d_rmmac = c5471_rmmac; /* Remove multicast MAC address */
#endif #endif
arch/arm/src/efm32/chip/efm32_dma.h
+1 -1
View File
@@ -76,7 +76,7 @@
* Pre-processor Definitions * Pre-processor Definitions
*******************************************************************************************************************************/ *******************************************************************************************************************************/
#if defined(CONFIG_EFM32_EFM32GG) #if defined(CONFIG_EFM32_EFM32GG)
# define EFM32_DMA_NCHANNELS 12 # define EFM32_DMA_NCHANNELS 12
#elif defined(CONFIG_EFM32_EFM32G) #elif defined(CONFIG_EFM32_EFM32G)
# define EFM32_DMA_NCHANNELS 8 # define EFM32_DMA_NCHANNELS 8
arch/arm/src/efm32/efm32_pm.h
+1 -1
View File
@@ -59,7 +59,7 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" extern "C"
arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
+1 -1
View File
@@ -119,4 +119,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC116X_PINCONFIG_H */ #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC116X_PINCONFIG_H */
arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
+1 -1
View File
@@ -70,4 +70,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H */ #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H */
arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
+1 -1
View File
@@ -70,4 +70,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H */ #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H */
arch/arm/src/lpc11xx/lpc11_i2c.c
+5 -5
View File
@@ -77,20 +77,20 @@
*******************************************************************************/ *******************************************************************************/
#ifndef GPIO_I2C1_SCL #ifndef GPIO_I2C1_SCL
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 # define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 # define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
#endif #endif
#ifndef CONFIG_I2C0_FREQ #ifndef CONFIG_I2C0_FREQ
#define CONFIG_I2C0_FREQ 100000 # define CONFIG_I2C0_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C1_FREQ #ifndef CONFIG_I2C1_FREQ
#define CONFIG_I2C1_FREQ 100000 # define CONFIG_I2C1_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C2_FREQ #ifndef CONFIG_I2C2_FREQ
#define CONFIG_I2C2_FREQ 100000 # define CONFIG_I2C2_FREQ 100000
#endif #endif
#define I2C_TIMEOUT ((20 * CLK_TCK) / 1000) /* 20 mS */ #define I2C_TIMEOUT ((20 * CLK_TCK) / 1000) /* 20 mS */
arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h
+1 -1
View File
@@ -231,4 +231,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */ #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */
arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h
+1 -1
View File
@@ -656,4 +656,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */ #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */
arch/arm/src/lpc17xx/chip/lpc17_memorymap.h
+1 -1
View File
@@ -72,4 +72,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */ #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */
arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h
+1 -1
View File
@@ -72,4 +72,4 @@
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */ #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */
arch/arm/src/lpc17xx/lpc17_i2c.c
+5 -5
View File
@@ -73,20 +73,20 @@
#if defined(CONFIG_LPC17_I2C0) || defined(CONFIG_LPC17_I2C1) || defined(CONFIG_LPC17_I2C2) #if defined(CONFIG_LPC17_I2C0) || defined(CONFIG_LPC17_I2C1) || defined(CONFIG_LPC17_I2C2)
#ifndef GPIO_I2C1_SCL #ifndef GPIO_I2C1_SCL
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 # define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 # define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
#endif #endif
#ifndef CONFIG_I2C0_FREQ #ifndef CONFIG_I2C0_FREQ
#define CONFIG_I2C0_FREQ 100000 # define CONFIG_I2C0_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C1_FREQ #ifndef CONFIG_I2C1_FREQ
#define CONFIG_I2C1_FREQ 100000 # define CONFIG_I2C1_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C2_FREQ #ifndef CONFIG_I2C2_FREQ
#define CONFIG_I2C2_FREQ 100000 # define CONFIG_I2C2_FREQ 100000
#endif #endif
/******************************************************************************* /*******************************************************************************
arch/arm/src/lpc43xx/lpc43_i2c.c
+8 -5
View File
@@ -78,17 +78,20 @@
#if defined(CONFIG_LPC43_I2C0) || defined(CONFIG_LPC43_I2C1) #if defined(CONFIG_LPC43_I2C0) || defined(CONFIG_LPC43_I2C1)
#ifndef GPIO_I2C1_SCL #ifndef GPIO_I2C1_SCL
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 # define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 # define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
#endif #endif
#ifndef CONFIG_I2C0_FREQ #ifndef CONFIG_I2C0_FREQ
#define CONFIG_I2C0_FREQ 100000 # define CONFIG_I2C0_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C1_FREQ #ifndef CONFIG_I2C1_FREQ
#define CONFIG_I2C1_FREQ 100000 # define CONFIG_I2C1_FREQ 100000
#endif #endif
#ifndef CONFIG_I2C2_FREQ #ifndef CONFIG_I2C2_FREQ
#define CONFIG_I2C2_FREQ 100000 # define CONFIG_I2C2_FREQ 100000
#endif #endif
/******************************************************************************* /*******************************************************************************
arch/arm/src/sam34/chip/sam4l_lcdca.h
+1 -1
View File
@@ -159,7 +159,7 @@
#define LCDCA_TIM_PRESC (1 << 0) /* Bit 0: LCD Prescaler Select */ #define LCDCA_TIM_PRESC (1 << 0) /* Bit 0: LCD Prescaler Select */
#define LCDCA_TIM_CLKDIV_SHIFT (1) /* Bits 1-3: LCD Clock Division */ #define LCDCA_TIM_CLKDIV_SHIFT (1) /* Bits 1-3: LCD Clock Division */
#define LCDCA_TIM_CLKDIV_MASK (7 << LCDCA_TIM_CLKDIV_SHIFT) #define LCDCA_TIM_CLKDIV_MASK (7 << LCDCA_TIM_CLKDIV_SHIFT)
#define LCDCA_TIM_CLKDIV(n) (((n)-1) << LCDCA_TIM_CLKDIV_SHIFT) /* n=1..8 */ # define LCDCA_TIM_CLKDIV(n) (((n)-1) << LCDCA_TIM_CLKDIV_SHIFT) /* n=1..8 */
#define LCDCA_TIM_FC0_SHIFT (8) /* Bits 8-12: Frame Counter 0 */ #define LCDCA_TIM_FC0_SHIFT (8) /* Bits 8-12: Frame Counter 0 */
#define LCDCA_TIM_FC0_MASK (31 << LCDCA_TIM_FC0_SHIFT) #define LCDCA_TIM_FC0_MASK (31 << LCDCA_TIM_FC0_SHIFT)
# define LCDCA_TIM_FC0(n) ((n) << LCDCA_TIM_FC0_SHIFT) /* n=0-31 */ # define LCDCA_TIM_FC0(n) ((n) << LCDCA_TIM_FC0_SHIFT) /* n=0-31 */
arch/arm/src/sam34/sam3u_gpio.h
+1 -1
View File
@@ -193,7 +193,7 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
arch/arm/src/sam34/sam3x_gpio.h
+1 -1
View File
@@ -196,7 +196,7 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
arch/arm/src/sam34/sam4e_gpio.h
+1 -1
View File
@@ -200,7 +200,7 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
arch/arm/src/sam34/sam_twi.c
+1 -1
View File
@@ -82,7 +82,7 @@
#endif #endif
#ifndef CONFIG_SAM34_TWI1_FREQUENCY #ifndef CONFIG_SAM34_TWI1_FREQUENCY
#define CONFIG_SAM34_TWI1_FREQUENCY 100000 # define CONFIG_SAM34_TWI1_FREQUENCY 100000
#endif #endif
/* Driver internal definitions *************************************************/ /* Driver internal definitions *************************************************/
arch/arm/src/sama5/sam_twi.c
+3 -3
View File
@@ -84,15 +84,15 @@
#endif #endif
#ifndef CONFIG_SAMA5_TWI1_FREQUENCY #ifndef CONFIG_SAMA5_TWI1_FREQUENCY
#define CONFIG_SAMA5_TWI1_FREQUENCY 100000 # define CONFIG_SAMA5_TWI1_FREQUENCY 100000
#endif #endif
#ifndef CONFIG_SAMA5_TWI2_FREQUENCY #ifndef CONFIG_SAMA5_TWI2_FREQUENCY
#define CONFIG_SAMA5_TWI2_FREQUENCY 100000 # define CONFIG_SAMA5_TWI2_FREQUENCY 100000
#endif #endif
#ifndef CONFIG_SAMA5_TWI3_FREQUENCY #ifndef CONFIG_SAMA5_TWI3_FREQUENCY
#define CONFIG_SAMA5_TWI3_FREQUENCY 100000 # define CONFIG_SAMA5_TWI3_FREQUENCY 100000
#endif #endif
/* Driver internal definitions *************************************************/ /* Driver internal definitions *************************************************/
arch/arm/src/samv7/sam_twihs.c
+2 -2
View File
@@ -84,11 +84,11 @@
#endif #endif
#ifndef CONFIG_SAMV7_TWIHS1_FREQUENCY #ifndef CONFIG_SAMV7_TWIHS1_FREQUENCY
#define CONFIG_SAMV7_TWIHS1_FREQUENCY 100000 # define CONFIG_SAMV7_TWIHS1_FREQUENCY 100000
#endif #endif
#ifndef CONFIG_SAMV7_TWIHS2_FREQUENCY #ifndef CONFIG_SAMV7_TWIHS2_FREQUENCY
#define CONFIG_SAMV7_TWIHS2_FREQUENCY 100000 # define CONFIG_SAMV7_TWIHS2_FREQUENCY 100000
#endif #endif
/* Driver internal definitions *************************************************/ /* Driver internal definitions *************************************************/
arch/arm/src/stm32/chip/stm32f44xxx_pinmap.h
+5 -5
View File
@@ -816,11 +816,11 @@
#define GPIO_SAI2_SCK_A_2 (GPIO_ALT|GPIO_AF8|GPIO_PORTD|GPIO_PIN14) #define GPIO_SAI2_SCK_A_2 (GPIO_ALT|GPIO_AF8|GPIO_PORTD|GPIO_PIN14)
#define GPIO_SAI2_SCK_B_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN12) #define GPIO_SAI2_SCK_B_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN12)
#define GPIO_SAI2_SCK_B_2 (GPIO_ALT|GPIO_AF8|GPIO_PORTA|GPIO_PIN2) #define GPIO_SAI2_SCK_B_2 (GPIO_ALT|GPIO_AF8|GPIO_PORTA|GPIO_PIN2)
#define GPIO_SAI2_SD_A_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTD|GPIO_PIN11) #define GPIO_SAI2_SD_A_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTD|GPIO_PIN11)
#define GPIO_SAI2_SD_A_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11) #define GPIO_SAI2_SD_A_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11)
#define GPIO_SAI2_SD_B_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTG|GPIO_PIN10) #define GPIO_SAI2_SD_B_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTG|GPIO_PIN10)
#define GPIO_SAI2_SD_B_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11) #define GPIO_SAI2_SD_B_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11)
#define GPIO_SAI2_SD_B_3 (GPIO_ALT|GPIO_AF10|GPIO_PORTF|GPIO_PIN11) #define GPIO_SAI2_SD_B_3 (GPIO_ALT|GPIO_AF10|GPIO_PORTF|GPIO_PIN11)
/* HDMI-CEC Controller */ /* HDMI-CEC Controller */
arch/arm/src/stm32/stm32_adc.c
+1 -1
View File
@@ -546,7 +546,7 @@ static void adc_tim_dumpregs(struct stm32_dev_s *priv, FAR const char *msg)
* *
****************************************************************************/ ****************************************************************************/
#ifdef ADC_HAVE_TIMER #ifdef ADC_HAVE_TIMER
static void adc_timstart(struct stm32_dev_s *priv, bool enable) static void adc_timstart(struct stm32_dev_s *priv, bool enable)
{ {
uint16_t regval; uint16_t regval;
arch/arm/src/stm32/stm32_ltdc.c
+3 -3
View File
@@ -2095,7 +2095,7 @@ static void stm32_ltdc_linit(int lid)
# ifdef STM32_LAYER_CLUT_SIZE # ifdef STM32_LAYER_CLUT_SIZE
ltdc->setclut = stm32_setclut; ltdc->setclut = stm32_setclut;
ltdc->getclut = stm32_getclut; ltdc->getclut = stm32_getclut;
#endif #endif
ltdc->setcolor = stm32_setcolor; ltdc->setcolor = stm32_setcolor;
ltdc->getcolor = stm32_getcolor; ltdc->getcolor = stm32_getcolor;
ltdc->setcolorkey = stm32_setcolorkey; ltdc->setcolorkey = stm32_setcolorkey;
@@ -2107,11 +2107,11 @@ static void stm32_ltdc_linit(int lid)
ltdc->setarea = stm32_setarea; ltdc->setarea = stm32_setarea;
ltdc->getarea = stm32_getarea; ltdc->getarea = stm32_getarea;
ltdc->update = stm32_update; ltdc->update = stm32_update;
#ifdef CONFIG_STM32_DMA2D #ifdef CONFIG_STM32_DMA2D
ltdc->blit = stm32_blit; ltdc->blit = stm32_blit;
ltdc->blend = stm32_blend; ltdc->blend = stm32_blend;
ltdc->fillarea = stm32_fillarea; ltdc->fillarea = stm32_fillarea;
#endif #endif
#endif #endif
/* Initialize the layer state */ /* Initialize the layer state */
arch/arm/src/stm32/stm32_pm.h
+1 -1
View File
@@ -59,7 +59,7 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" extern "C"
arch/avr/src/at32uc3/at32uc3_internal.h
+1 -1
View File
@@ -65,7 +65,7 @@
* F... .... .... .... * F... .... .... ....
*/ */
#define GPIO_GLITCH (1 << 15) /* Bit 15: Glitch filter enable */ #define GPIO_GLITCH (1 << 15) /* Bit 15: Glitch filter enable */
/* Interrupt modes (valid only if GPIO_INTR==1) /* Interrupt modes (valid only if GPIO_INTR==1)
* .MM. .... .... .... * .MM. .... .... ....
arch/hc/src/m9s12/m9s12_timerisr.c
+2 -2
View File
@@ -115,8 +115,8 @@
* OSCCLK / (CLK_TCK * PRER_DIV) - 1 * OSCCLK / (CLK_TCK * PRER_DIV) - 1
*/ */
#define MODCNT_DENOM ((uint32_t)CLK_TCK * (uint32_t)PRER_DIV) #define MODCNT_DENOM ((uint32_t)CLK_TCK * (uint32_t)PRER_DIV)
#define MODCNT_VALUE ((((uint32_t)HCS12_OSCCLK + (MODCNT_DENOM/2))/ MODCNT_DENOM) - 1) #define MODCNT_VALUE ((((uint32_t)HCS12_OSCCLK + (MODCNT_DENOM/2))/ MODCNT_DENOM) - 1)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
arch/sh/src/m16c/m16c_lowputc.c
+1 -1
View File
@@ -263,7 +263,7 @@ static inline void up_lowserialsetup(void)
/* Set port direction registers for Rx/TX pins */ /* Set port direction registers for Rx/TX pins */
#if defined(CONFIG_UART0_SERIAL_CONSOLE) #if defined(CONFIG_UART0_SERIAL_CONSOLE)
regval = getreg8(M16C_PD6); regval = getreg8(M16C_PD6);
regval &= ~(1 << 2); /* PD6-2:RxD1 */ regval &= ~(1 << 2); /* PD6-2:RxD1 */
regval |= (1 << 3); /* PD6-3:TxD1 */ regval |= (1 << 3); /* PD6-3:TxD1 */
arch/x86/include/i486/io.h
+1 -1
View File
@@ -55,7 +55,7 @@
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/**************************************************************************** /****************************************************************************
* Inline functions * Inline functions
arch/x86/src/i486/i486_utils.S
+1 -1
View File
@@ -48,7 +48,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define KSEG 0x10 #define KSEG 0x10
/**************************************************************************** /****************************************************************************
* Globals * Globals
arch/z80/src/ez80/chip.h
+1 -1
View File
@@ -89,7 +89,7 @@ EXTERN uint32_t ez80_systemclock;
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif