From 9681c525171af6556d3e4decf663b2fc74d5c0bc Mon Sep 17 00:00:00 2001 From: simbit18 <101105604+simbit18@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:36:33 +0200 Subject: [PATCH] Fix nuttx coding style Remove TABs Fix indentation --- .../stm32f7/stm32f769i-disco/include/board.h | 24 +- .../stm32f777zit6-meadow/include/board.h | 26 +- .../nucleo-h743zi2/src/nucleo-h743zi2.h | 6 +- boards/renesas/m16c/skp16c26/include/board.h | 2 +- .../rx65n/rx65n-grrose/include/rx65n_gpio.h | 2 +- crypto/siphash.c | 4 +- drivers/sensors/bmi160.c | 4 +- drivers/sensors/bmi270.c | 16 +- fs/nxffs/nxffs.h | 2 +- fs/spiffs/src/spiffs_core.h | 4 +- include/crypto/cmac.h | 4 +- include/crypto/cryptodev.h | 6 +- include/errno.h | 32 +-- include/netpacket/can.h | 4 +- include/nuttx/input/x11_xf86keysym.h | 2 +- include/nuttx/net/ip.h | 8 +- include/nuttx/sensors/msa301.h | 40 +-- include/nuttx/video/video_controls.h | 232 +++++++++--------- include/stdint.h | 4 +- net/tcp/tcp.h | 12 +- 20 files changed, 217 insertions(+), 217 deletions(-) diff --git a/boards/arm/stm32f7/stm32f769i-disco/include/board.h b/boards/arm/stm32f7/stm32f769i-disco/include/board.h index 0b1c518287..0f6e49da08 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/include/board.h +++ b/boards/arm/stm32f7/stm32f769i-disco/include/board.h @@ -347,20 +347,20 @@ * (work in progress as of 2017 07 19) */ -#define BOARD_LTDC_WIDTH 800 -#define BOARD_LTDC_HEIGHT 472 +#define BOARD_LTDC_WIDTH 800 +#define BOARD_LTDC_HEIGHT 472 -#define BOARD_LTDC_HSYNC 10 -#define BOARD_LTDC_HFP 10 -#define BOARD_LTDC_HBP 20 -#define BOARD_LTDC_VSYNC 2 -#define BOARD_LTDC_VFP 4 -#define BOARD_LTDC_VBP 2 +#define BOARD_LTDC_HSYNC 10 +#define BOARD_LTDC_HFP 10 +#define BOARD_LTDC_HBP 20 +#define BOARD_LTDC_VSYNC 2 +#define BOARD_LTDC_VFP 4 +#define BOARD_LTDC_VBP 2 -#define BOARD_LTDC_GCR_PCPOL 0 -#define BOARD_LTDC_GCR_DEPOL 0 -#define BOARD_LTDC_GCR_VSPOL 0 -#define BOARD_LTDC_GCR_HSPOL 0 +#define BOARD_LTDC_GCR_PCPOL 0 +#define BOARD_LTDC_GCR_DEPOL 0 +#define BOARD_LTDC_GCR_VSPOL 0 +#define BOARD_LTDC_GCR_HSPOL 0 /* DMA Channel/Stream Selections ********************************************/ diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h b/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h index 868f88688c..4f81a29a47 100644 --- a/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h +++ b/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h @@ -313,7 +313,7 @@ #define BOARD_LED3_BIT (1 << BOARD_LED3) /* If CONFIG_ARCH_LEDS is defined, the usage by the board port is defined in - * include/board.h and src/stm32_leds.c. The LEDs are used + * include/board.h and src/stm32_leds.c. The LEDs are used * to encode OS-related events as follows: * * SYMBOL Meaning LD1 @@ -359,20 +359,20 @@ * (work in progress as of 2017 07 19) */ -#define BOARD_LTDC_WIDTH 800 -#define BOARD_LTDC_HEIGHT 472 +#define BOARD_LTDC_WIDTH 800 +#define BOARD_LTDC_HEIGHT 472 -#define BOARD_LTDC_HSYNC 10 -#define BOARD_LTDC_HFP 10 -#define BOARD_LTDC_HBP 20 -#define BOARD_LTDC_VSYNC 2 -#define BOARD_LTDC_VFP 4 -#define BOARD_LTDC_VBP 2 +#define BOARD_LTDC_HSYNC 10 +#define BOARD_LTDC_HFP 10 +#define BOARD_LTDC_HBP 20 +#define BOARD_LTDC_VSYNC 2 +#define BOARD_LTDC_VFP 4 +#define BOARD_LTDC_VBP 2 -#define BOARD_LTDC_GCR_PCPOL 0 -#define BOARD_LTDC_GCR_DEPOL 0 -#define BOARD_LTDC_GCR_VSPOL 0 -#define BOARD_LTDC_GCR_HSPOL 0 +#define BOARD_LTDC_GCR_PCPOL 0 +#define BOARD_LTDC_GCR_DEPOL 0 +#define BOARD_LTDC_GCR_VSPOL 0 +#define BOARD_LTDC_GCR_HSPOL 0 /* DMA Channel/Stream Selections ********************************************/ diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h index 18630e5d5f..9dfaebd199 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h @@ -82,9 +82,9 @@ #define GPIO_LD3 (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | \ GPIO_OUTPUT_CLEAR | GPIO_PORTB | GPIO_PIN14) -#define GPIO_LED_GREEN GPIO_LD1 -#define GPIO_LED_ORANGE GPIO_LD2 -#define GPIO_LED_RED GPIO_LD3 +#define GPIO_LED_GREEN GPIO_LD1 +#define GPIO_LED_ORANGE GPIO_LD2 +#define GPIO_LED_RED GPIO_LD3 #define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz| \ GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9) diff --git a/boards/renesas/m16c/skp16c26/include/board.h b/boards/renesas/m16c/skp16c26/include/board.h index 19e5a502a2..0565d5f111 100644 --- a/boards/renesas/m16c/skp16c26/include/board.h +++ b/boards/renesas/m16c/skp16c26/include/board.h @@ -51,7 +51,7 @@ /* Xin Freq */ -#define M16C_XIN_FREQ 20000000 /* 20MHz */ +#define M16C_XIN_FREQ 20000000 /* 20MHz */ /* Interrupt Priority Levels ************************************************/ diff --git a/boards/renesas/rx65n/rx65n-grrose/include/rx65n_gpio.h b/boards/renesas/rx65n/rx65n-grrose/include/rx65n_gpio.h index 5afc81da81..e369fbb497 100644 --- a/boards/renesas/rx65n/rx65n-grrose/include/rx65n_gpio.h +++ b/boards/renesas/rx65n/rx65n-grrose/include/rx65n_gpio.h @@ -28,7 +28,7 @@ #define PHY_STS_BIT_MASK (0x4) #define PHY_STS_SHIFT_COUNT (0x02) #else - #define PHY_STS_REG 0x10 + #define PHY_STS_REG 0x10 #define PHY_STS_REG_LINK (1 << 0) #define PHY_STS_READ_REG PHY_STS_REG #define PHY_STS_BIT_MASK (0x1) diff --git a/crypto/siphash.c b/crypto/siphash.c index 73bf48e7c4..dfdcd78ea8 100644 --- a/crypto/siphash.c +++ b/crypto/siphash.c @@ -54,8 +54,8 @@ #include -static void siphash_crounds(FAR SIPHASH_CTX *, int); -static void siphash_rounds(FAR SIPHASH_CTX *, int); +static void siphash_crounds(FAR SIPHASH_CTX *, int); +static void siphash_rounds(FAR SIPHASH_CTX *, int); /**************************************************************************** * Public Functions diff --git a/drivers/sensors/bmi160.c b/drivers/sensors/bmi160.c index 3ce8c4cc2c..9af8b9d259 100644 --- a/drivers/sensors/bmi160.c +++ b/drivers/sensors/bmi160.c @@ -199,9 +199,9 @@ /* Register 0x7e - CMD */ -#define ACCEL_PM_SUSPEND (0X10) +#define ACCEL_PM_SUSPEND (0X10) #define ACCEL_PM_NORMAL (0x11) -#define ACCEL_PM_LOWPOWER (0X12) +#define ACCEL_PM_LOWPOWER (0X12) #define GYRO_PM_SUSPEND (0x14) #define GYRO_PM_NORMAL (0x15) #define GYRO_PM_FASTSTARTUP (0x17) diff --git a/drivers/sensors/bmi270.c b/drivers/sensors/bmi270.c index 4596674f64..f852b9b254 100644 --- a/drivers/sensors/bmi270.c +++ b/drivers/sensors/bmi270.c @@ -184,20 +184,20 @@ /* Register 0x7d - PWR_CONF */ -#define PWRCONF_APS_ON (1 << 0) -#define PWRCONF_FSW_ON (1 << 1) -#define PWRCONF_FUP_ON (1 << 2) +#define PWRCONF_APS_ON (1 << 0) +#define PWRCONF_FSW_ON (1 << 1) +#define PWRCONF_FUP_ON (1 << 2) /* Register 0x7d - PWR_CTRL */ -#define PWRCTRL_AUX_EN (1 << 0) -#define PWRCTRL_GYR_EN (1 << 1) -#define PWRCTRL_ACC_EN (1 << 2) -#define PWRCTRL_TEMP_EN (1 << 3) +#define PWRCTRL_AUX_EN (1 << 0) +#define PWRCTRL_GYR_EN (1 << 1) +#define PWRCTRL_ACC_EN (1 << 2) +#define PWRCTRL_TEMP_EN (1 << 3) /* Register 0x7e - CMD */ -#define CMD_SOFTRESET (0xB6) +#define CMD_SOFTRESET (0xB6) /**************************************************************************** * Private Types diff --git a/fs/nxffs/nxffs.h b/fs/nxffs/nxffs.h index 4569b4f310..a2da06a36e 100644 --- a/fs/nxffs/nxffs.h +++ b/fs/nxffs/nxffs.h @@ -155,7 +155,7 @@ /* Number of bytes in an the NXFFS magic sequences */ -#define NXFFS_MAGICSIZE 4 +#define NXFFS_MAGICSIZE 4 /* When we allocate FLASH for a new inode data block, we will require that * space is available to hold this minimum number of data bytes in addition diff --git a/fs/spiffs/src/spiffs_core.h b/fs/spiffs/src/spiffs_core.h index 1c4065b949..feae62bbee 100644 --- a/fs/spiffs/src/spiffs_core.h +++ b/fs/spiffs/src/spiffs_core.h @@ -391,9 +391,9 @@ begin_packed_struct struct spiffs_page_header_s /* Object index header page header */ #ifdef CONFIG_SPIFFS_LEADING_SLASH -#define SPIFFS_LEADING_SLASH_SIZE 1 +#define SPIFFS_LEADING_SLASH_SIZE 1 #else -#define SPIFFS_LEADING_SLASH_SIZE 0 +#define SPIFFS_LEADING_SLASH_SIZE 0 #endif begin_packed_struct struct spiffs_pgobj_ndxheader_s diff --git a/include/crypto/cmac.h b/include/crypto/cmac.h index 7a8c948c7d..ac44a0ebec 100644 --- a/include/crypto/cmac.h +++ b/include/crypto/cmac.h @@ -27,8 +27,8 @@ #include -#define AES_CMAC_KEY_LENGTH 16 -#define AES_CMAC_DIGEST_LENGTH 16 +#define AES_CMAC_KEY_LENGTH 16 +#define AES_CMAC_DIGEST_LENGTH 16 typedef struct _AES_CMAC_CTX { diff --git a/include/crypto/cryptodev.h b/include/crypto/cryptodev.h index fe6ca1a3da..aef7ba2d4b 100644 --- a/include/crypto/cryptodev.h +++ b/include/crypto/cryptodev.h @@ -118,9 +118,9 @@ /* Algorithm flags */ -#define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ -#define CRYPTO_ALG_FLAG_RNG_ENABLE 0x02 /* Has HW RNG for DH/DSA */ -#define CRYPTO_ALG_FLAG_DSA_SHA 0x04 /* Can do SHA on msg */ +#define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ +#define CRYPTO_ALG_FLAG_RNG_ENABLE 0x02 /* Has HW RNG for DH/DSA */ +#define CRYPTO_ALG_FLAG_DSA_SHA 0x04 /* Can do SHA on msg */ /* Standard initialization structure beginning */ diff --git a/include/errno.h b/include/errno.h index 7731ac7ae8..eaa976c993 100644 --- a/include/errno.h +++ b/include/errno.h @@ -124,12 +124,12 @@ /* Sync with linux/include/asm-generic/errno.h */ -#define EDEADLK 35 -#define EDEADLK_STR "Resource deadlock would occur" -#define ENAMETOOLONG 36 -#define ENAMETOOLONG_STR "File name too long" -#define ENOLCK 37 -#define ENOLCK_STR "No record locks available" +#define EDEADLK 35 +#define EDEADLK_STR "Resource deadlock would occur" +#define ENAMETOOLONG 36 +#define ENAMETOOLONG_STR "File name too long" +#define ENOLCK 37 +#define ENOLCK_STR "No record locks available" #define ENOSYS 38 #define ENOSYS_STR "Invalid system call number" #define ENOTEMPTY 39 @@ -302,18 +302,18 @@ #define EDQUOT_STR "Quota exceeded" #define ENOMEDIUM 123 /* Linux errno extension */ #define ENOMEDIUM_STR "No medium found" -#define EMEDIUMTYPE 124 -#define EMEDIUMTYPE_STR "Wrong medium type" +#define EMEDIUMTYPE 124 +#define EMEDIUMTYPE_STR "Wrong medium type" #define ECANCELED 125 #define ECANCELED_STR "Operation cancelled" -#define ENOKEY 126 -#define ENOKEY_STR "Required key not available" -#define EKEYEXPIRED 127 -#define EKEYEXPIRED_STR "Key has expired" -#define EKEYREVOKED 128 -#define EKEYREVOKED_STR "Key has been revoked" -#define EKEYREJECTED 129 -#define EKEYREJECTED_STR "Key was rejected by service" +#define ENOKEY 126 +#define ENOKEY_STR "Required key not available" +#define EKEYEXPIRED 127 +#define EKEYEXPIRED_STR "Key has expired" +#define EKEYREVOKED 128 +#define EKEYREVOKED_STR "Key has been revoked" +#define EKEYREJECTED 129 +#define EKEYREJECTED_STR "Key was rejected by service" #define EOWNERDEAD 130 #define EOWNERDEAD_STR "Previous owner died" #define ENOTRECOVERABLE 131 diff --git a/include/netpacket/can.h b/include/netpacket/can.h index 1d1f730cdc..236bbbf2a3 100644 --- a/include/netpacket/can.h +++ b/include/netpacket/can.h @@ -47,8 +47,8 @@ #define CAN_EFF_MASK 0x1fffffff /* Extended frame format (EFF) */ #define CAN_ERR_MASK 0x1fffffff /* Omit EFF, RTR, ERR flags */ -#define CAN_MTU (sizeof(struct can_frame)) -#define CANFD_MTU (sizeof(struct canfd_frame)) +#define CAN_MTU (sizeof(struct can_frame)) +#define CANFD_MTU (sizeof(struct canfd_frame)) /* PF_CAN protocols */ diff --git a/include/nuttx/input/x11_xf86keysym.h b/include/nuttx/input/x11_xf86keysym.h index a6f316aefd..215613c414 100644 --- a/include/nuttx/input/x11_xf86keysym.h +++ b/include/nuttx/input/x11_xf86keysym.h @@ -182,7 +182,7 @@ #define XF86XK_Battery 0x1008FF93 /* Display battery information */ #define XF86XK_Bluetooth 0x1008FF94 /* Enable/disable Bluetooth */ #define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */ -#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */ +#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */ #define XF86XK_AudioForward 0x1008FF97 /* fast-forward audio track */ #define XF86XK_AudioRepeat 0x1008FF98 /* toggle repeat mode */ diff --git a/include/nuttx/net/ip.h b/include/nuttx/net/ip.h index 8f72e6ce92..8457a8579b 100644 --- a/include/nuttx/net/ip.h +++ b/include/nuttx/net/ip.h @@ -81,10 +81,10 @@ #define IPTOS_TOS_MASK 0x1e #define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK) -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 +#define IPTOS_LOWDELAY 0x10 +#define IPTOS_THROUGHPUT 0x08 +#define IPTOS_RELIABILITY 0x04 +#define IPTOS_MINCOST 0x02 #define IPTOS_PREC_MASK 0xe0 #define IPTOS_PREC(tos) ((tos) & IPTOS_PREC_MASK) diff --git a/include/nuttx/sensors/msa301.h b/include/nuttx/sensors/msa301.h index e9d58663b0..db9ff1d430 100644 --- a/include/nuttx/sensors/msa301.h +++ b/include/nuttx/sensors/msa301.h @@ -35,32 +35,32 @@ * Pre-processor Definitions ****************************************************************************/ -#define MSA301_ACCEL_ADDR0 0x26 +#define MSA301_ACCEL_ADDR0 0x26 #define SNIOC_MSA301_START _SNIOC(0x0001) #define SNIOC_MSA301_STOP _SNIOC(0x0002) #define SNIOC_MSA301_SET_RANGE _SNIOC(0x0003) #define SNIOC_MSA301_SET_RATE _SNIOC(0x0004) -#define MSA301_REG_PARTID 0x01 -#define MSA301_REG_OUT_X_L 0x02 -#define MSA301_REG_OUT_X_H 0x03 -#define MSA301_REG_OUT_Y_L 0x04 -#define MSA301_REG_OUT_Y_H 0x05 -#define MSA301_REG_OUT_Z_L 0x06 -#define MSA301_REG_OUT_Z_H 0x07 -#define MSA301_REG_MOTIONINT 0x09 -#define MSA301_REG_DATAINT 0x0A -#define MSA301_REG_CLICKSTATUS 0x0B -#define MSA301_REG_RESRANGE 0x0F -#define MSA301_REG_ODR 0x10 -#define MSA301_REG_POWERMODE 0x11 -#define MSA301_REG_INTSET0 0x16 -#define MSA301_REG_INTSET1 0x17 -#define MSA301_REG_INTMAP0 0x19 -#define MSA301_REG_INTMAP1 0x1A -#define MSA301_REG_TAPDUR 0x2A -#define MSA301_REG_TAPTH 0x2B +#define MSA301_REG_PARTID 0x01 +#define MSA301_REG_OUT_X_L 0x02 +#define MSA301_REG_OUT_X_H 0x03 +#define MSA301_REG_OUT_Y_L 0x04 +#define MSA301_REG_OUT_Y_H 0x05 +#define MSA301_REG_OUT_Z_L 0x06 +#define MSA301_REG_OUT_Z_H 0x07 +#define MSA301_REG_MOTIONINT 0x09 +#define MSA301_REG_DATAINT 0x0A +#define MSA301_REG_CLICKSTATUS 0x0B +#define MSA301_REG_RESRANGE 0x0F +#define MSA301_REG_ODR 0x10 +#define MSA301_REG_POWERMODE 0x11 +#define MSA301_REG_INTSET0 0x16 +#define MSA301_REG_INTSET1 0x17 +#define MSA301_REG_INTMAP0 0x19 +#define MSA301_REG_INTMAP1 0x1A +#define MSA301_REG_TAPDUR 0x2A +#define MSA301_REG_TAPTH 0x2B /**************************************************************************** * Public Types diff --git a/include/nuttx/video/video_controls.h b/include/nuttx/video/video_controls.h index b6ce4ef119..6373080a6f 100644 --- a/include/nuttx/video/video_controls.h +++ b/include/nuttx/video/video_controls.h @@ -31,196 +31,196 @@ /* Control classes */ -#define V4L2_CTRL_CLASS_USER (0x0000) /**< Old-style 'user' controls */ -#define V4L2_CTRL_CLASS_CAMERA (0x0001) /**< Camera class controls */ -#define V4L2_CTRL_CLASS_FLASH (0x0002) /**< Camera flash controls */ -#define V4L2_CTRL_CLASS_JPEG (0x0003) /**< JPEG-compression controls */ +#define V4L2_CTRL_CLASS_USER (0x0000) /* Old-style 'user' controls */ +#define V4L2_CTRL_CLASS_CAMERA (0x0001) /* Camera class controls */ +#define V4L2_CTRL_CLASS_FLASH (0x0002) /* Camera flash controls */ +#define V4L2_CTRL_CLASS_JPEG (0x0003) /* JPEG-compression controls */ /* User-class control IDs */ -#define V4L2_CID_BRIGHTNESS (0) /**< Brightness */ -#define V4L2_CID_CONTRAST (1) /**< Contrast */ -#define V4L2_CID_SATURATION (2) /**< Saturation */ -#define V4L2_CID_HUE (3) /**< Hue */ -#define V4L2_CID_AUTO_WHITE_BALANCE (4) /**< AWB */ -#define V4L2_CID_RED_BALANCE (5) /**< Red balance */ -#define V4L2_CID_BLUE_BALANCE (6) /**< Blue balance */ -#define V4L2_CID_GAMMA (7) /**< Gamma value adjustment */ -#define V4L2_CID_GAMMA_CURVE (8) /**< Gamma curve adjustment */ -#define V4L2_CID_EXPOSURE (9) /**< Exposure value */ -#define V4L2_CID_HFLIP (10) /**< Mirror horizontally(VIDEO) */ -#define V4L2_CID_VFLIP (11) /**< Mirror vertically(VIDEO) */ -#define V4L2_CID_HFLIP_STILL (12) /**< Mirror horizontally(STILL) */ -#define V4L2_CID_VFLIP_STILL (13) /**< Mirror vertically(STILL) */ -#define V4L2_CID_SHARPNESS (14) /**< Sharpness */ -#define V4L2_CID_COLOR_KILLER (15) /**< Color killer */ -#define V4L2_CID_COLORFX (16) /**< Color effect */ +#define V4L2_CID_BRIGHTNESS (0) /* Brightness */ +#define V4L2_CID_CONTRAST (1) /* Contrast */ +#define V4L2_CID_SATURATION (2) /* Saturation */ +#define V4L2_CID_HUE (3) /* Hue */ +#define V4L2_CID_AUTO_WHITE_BALANCE (4) /* AWB */ +#define V4L2_CID_RED_BALANCE (5) /* Red balance */ +#define V4L2_CID_BLUE_BALANCE (6) /* Blue balance */ +#define V4L2_CID_GAMMA (7) /* Gamma value adjustment */ +#define V4L2_CID_GAMMA_CURVE (8) /* Gamma curve adjustment */ +#define V4L2_CID_EXPOSURE (9) /* Exposure value */ +#define V4L2_CID_HFLIP (10) /* Mirror horizontally(VIDEO) */ +#define V4L2_CID_VFLIP (11) /* Mirror vertically(VIDEO) */ +#define V4L2_CID_HFLIP_STILL (12) /* Mirror horizontally(STILL) */ +#define V4L2_CID_VFLIP_STILL (13) /* Mirror vertically(STILL) */ +#define V4L2_CID_SHARPNESS (14) /* Sharpness */ +#define V4L2_CID_COLOR_KILLER (15) /* Color killer */ +#define V4L2_CID_COLORFX (16) /* Color effect */ /** Enumeration for V4L2_CID_COLORFX */ enum v4l2_colorfx { - V4L2_COLORFX_NONE = 0, /**< No effect */ - V4L2_COLORFX_BW = 1, /**< Black/white */ - V4L2_COLORFX_SEPIA = 2, /**< Sepia */ - V4L2_COLORFX_NEGATIVE = 3, /**< Positive/negative inversion */ - V4L2_COLORFX_EMBOSS = 4, /**< Emboss */ - V4L2_COLORFX_SKETCH = 5, /**< Sketch */ - V4L2_COLORFX_SKY_BLUE = 6, /**< Sky blue */ - V4L2_COLORFX_GRASS_GREEN = 7, /**< Grass green */ - V4L2_COLORFX_SKIN_WHITEN = 8, /**< Skin whiten */ - V4L2_COLORFX_VIVID = 9, /**< Vivid */ - V4L2_COLORFX_AQUA = 10, /**< Aqua */ - V4L2_COLORFX_ART_FREEZE = 11, /**< Art freeze */ - V4L2_COLORFX_SILHOUETTE = 12, /**< Silhouette */ - V4L2_COLORFX_SOLARIZATION = 13, /**< Solarization */ - V4L2_COLORFX_ANTIQUE = 14, /**< Antique */ - V4L2_COLORFX_SET_CBCR = 15, /**< Set CbCr */ - V4L2_COLORFX_PASTEL = 16 /**< Pastel */ + V4L2_COLORFX_NONE = 0, /* No effect */ + V4L2_COLORFX_BW = 1, /* Black/white */ + V4L2_COLORFX_SEPIA = 2, /* Sepia */ + V4L2_COLORFX_NEGATIVE = 3, /* Positive/negative inversion */ + V4L2_COLORFX_EMBOSS = 4, /* Emboss */ + V4L2_COLORFX_SKETCH = 5, /* Sketch */ + V4L2_COLORFX_SKY_BLUE = 6, /* Sky blue */ + V4L2_COLORFX_GRASS_GREEN = 7, /* Grass green */ + V4L2_COLORFX_SKIN_WHITEN = 8, /* Skin whiten */ + V4L2_COLORFX_VIVID = 9, /* Vivid */ + V4L2_COLORFX_AQUA = 10, /* Aqua */ + V4L2_COLORFX_ART_FREEZE = 11, /* Art freeze */ + V4L2_COLORFX_SILHOUETTE = 12, /* Silhouette */ + V4L2_COLORFX_SOLARIZATION = 13, /* Solarization */ + V4L2_COLORFX_ANTIQUE = 14, /* Antique */ + V4L2_COLORFX_SET_CBCR = 15, /* Set CbCr */ + V4L2_COLORFX_PASTEL = 16 /* Pastel */ }; -#define V4L2_CID_AUTOBRIGHTNESS (17) /**< Auto brightness */ -#define V4L2_CID_ROTATE (18) /**< Rotation */ +#define V4L2_CID_AUTOBRIGHTNESS (17) /* Auto brightness */ +#define V4L2_CID_ROTATE (18) /* Rotation */ -/** Camera class control IDs */ +/* Camera class control IDs */ -#define V4L2_CID_EXPOSURE_AUTO (0) /**< Auto exposure */ +#define V4L2_CID_EXPOSURE_AUTO (0) /* Auto exposure */ -/** Enumeration for V4L2_CID_EXPOSURE_AUTO */ +/* Enumeration for V4L2_CID_EXPOSURE_AUTO */ enum v4l2_exposure_auto_type { - /** Exposure time:auto, iris aperture:auto */ + /* Exposure time:auto, iris aperture:auto */ V4L2_EXPOSURE_AUTO = 0, - /** Exposure time:manual, iris aperture:manual */ + /* Exposure time:manual, iris aperture:manual */ V4L2_EXPOSURE_MANUAL = 1, - /** Exposure time:manual, iris aperture:auto */ + /* Exposure time:manual, iris aperture:auto */ V4L2_EXPOSURE_SHUTTER_PRIORITY = 2, - /** Exposure time:auto, iris aperture:manual */ + /* Exposure time:auto, iris aperture:manual */ V4L2_EXPOSURE_APERTURE_PRIORITY = 3 }; -#define V4L2_CID_EXPOSURE_ABSOLUTE (1) /**< Exposure time */ +#define V4L2_CID_EXPOSURE_ABSOLUTE (1) /* Exposure time */ -#define V4L2_CID_FOCUS_ABSOLUTE (2) /** Focus */ -#define V4L2_CID_FOCUS_RELATIVE (3) /** Focus */ -#define V4L2_CID_FOCUS_AUTO (4) /** Auto focus */ +#define V4L2_CID_FOCUS_ABSOLUTE (2) /* Focus */ +#define V4L2_CID_FOCUS_RELATIVE (3) /* Focus */ +#define V4L2_CID_FOCUS_AUTO (4) /* Auto focus */ -#define V4L2_CID_ZOOM_ABSOLUTE (5) /** Zoom(absolute) */ -#define V4L2_CID_ZOOM_RELATIVE (6) /** Zoom(relative) */ -#define V4L2_CID_ZOOM_CONTINUOUS (7) /** Continuous zoom */ +#define V4L2_CID_ZOOM_ABSOLUTE (5) /* Zoom(absolute) */ +#define V4L2_CID_ZOOM_RELATIVE (6) /* Zoom(relative) */ +#define V4L2_CID_ZOOM_CONTINUOUS (7) /* Continuous zoom */ -#define V4L2_CID_IRIS_ABSOLUTE (8) /** Iris(absolute) */ -#define V4L2_CID_IRIS_RELATIVE (9) /** Iris(relative) */ +#define V4L2_CID_IRIS_ABSOLUTE (8) /* Iris(absolute) */ +#define V4L2_CID_IRIS_RELATIVE (9) /* Iris(relative) */ -#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE (10) /**< Preset white balance */ +#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE (10) /* Preset white balance */ -/** Enumeration for V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE */ +/* Enumeration for V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE */ enum v4l2_auto_n_preset_white_balance { - V4L2_WHITE_BALANCE_MANUAL = 0, /**< Manual */ - V4L2_WHITE_BALANCE_AUTO = 1, /**< Automatic */ - V4L2_WHITE_BALANCE_INCANDESCENT = 2, /**< Incandescent */ - V4L2_WHITE_BALANCE_FLUORESCENT = 3, /**< Fluorescent */ - V4L2_WHITE_BALANCE_FLUORESCENT_H = 4, /**< Fluorescent H */ - V4L2_WHITE_BALANCE_HORIZON = 5, /**< Horizon */ - V4L2_WHITE_BALANCE_DAYLIGHT = 6, /**< Daylight */ - V4L2_WHITE_BALANCE_FLASH = 7, /**< Flash */ - V4L2_WHITE_BALANCE_CLOUDY = 8, /**< Cloudy */ - V4L2_WHITE_BALANCE_SHADE = 9, /**< Shade */ + V4L2_WHITE_BALANCE_MANUAL = 0, /* Manual */ + V4L2_WHITE_BALANCE_AUTO = 1, /* Automatic */ + V4L2_WHITE_BALANCE_INCANDESCENT = 2, /* Incandescent */ + V4L2_WHITE_BALANCE_FLUORESCENT = 3, /* Fluorescent */ + V4L2_WHITE_BALANCE_FLUORESCENT_H = 4, /* Fluorescent H */ + V4L2_WHITE_BALANCE_HORIZON = 5, /* Horizon */ + V4L2_WHITE_BALANCE_DAYLIGHT = 6, /* Daylight */ + V4L2_WHITE_BALANCE_FLASH = 7, /* Flash */ + V4L2_WHITE_BALANCE_CLOUDY = 8, /* Cloudy */ + V4L2_WHITE_BALANCE_SHADE = 9, /* Shade */ }; -#define V4L2_CID_WIDE_DYNAMIC_RANGE (11) /**< Wide dynamic range */ -#define V4L2_CID_IMAGE_STABILIZATION (12) /**< Image stabilization */ +#define V4L2_CID_WIDE_DYNAMIC_RANGE (11) /* Wide dynamic range */ +#define V4L2_CID_IMAGE_STABILIZATION (12) /* Image stabilization */ -#define V4L2_CID_ISO_SENSITIVITY (13) /**< ISO sensitivity */ -#define V4L2_CID_ISO_SENSITIVITY_AUTO (14) /**< Auto ISO sensitivity */ +#define V4L2_CID_ISO_SENSITIVITY (13) /* ISO sensitivity */ +#define V4L2_CID_ISO_SENSITIVITY_AUTO (14) /* Auto ISO sensitivity */ -/** Enumeration for V4L2_CID_ISO_SENSITIVITY_AUTO */ +/* Enumeration for V4L2_CID_ISO_SENSITIVITY_AUTO */ enum v4l2_iso_sensitivity_auto_type { - V4L2_ISO_SENSITIVITY_MANUAL = 0, /**< Manual */ - V4L2_ISO_SENSITIVITY_AUTO = 1, /**< Automatic */ + V4L2_ISO_SENSITIVITY_MANUAL = 0, /* Manual */ + V4L2_ISO_SENSITIVITY_AUTO = 1, /* Automatic */ }; -#define V4L2_CID_EXPOSURE_METERING (15) /**< Exposure metering */ +#define V4L2_CID_EXPOSURE_METERING (15) /* Exposure metering */ -/** Enumeration for V4L2_CID_EXPOSURE_METERING */ +/* Enumeration for V4L2_CID_EXPOSURE_METERING */ enum v4l2_exposure_metering { - V4L2_EXPOSURE_METERING_AVERAGE = 0, /**< Average */ - V4L2_EXPOSURE_METERING_CENTER_WEIGHTED = 1, /**< Center weighted */ - V4L2_EXPOSURE_METERING_SPOT = 2, /**< Spot */ - V4L2_EXPOSURE_METERING_MATRIX = 3, /**< Matrix */ + V4L2_EXPOSURE_METERING_AVERAGE = 0, /* Average */ + V4L2_EXPOSURE_METERING_CENTER_WEIGHTED = 1, /* Center weighted */ + V4L2_EXPOSURE_METERING_SPOT = 2, /* Spot */ + V4L2_EXPOSURE_METERING_MATRIX = 3, /* Matrix */ }; -#define V4L2_CID_SCENE_MODE (16) /**< Scene selection */ +#define V4L2_CID_SCENE_MODE (16) /* Scene selection */ -/** Enumeration for V4L2_CID_SCENE_MODE */ +/* Enumeration for V4L2_CID_SCENE_MODE */ enum v4l2_scene_mode { - V4L2_SCENE_MODE_NONE = 0, /**< No scene */ - V4L2_SCENE_MODE_BACKLIGHT = 1, /**< Backlight */ - V4L2_SCENE_MODE_BEACH_SNOW = 2, /**< Beach snow */ - V4L2_SCENE_MODE_CANDLE_LIGHT = 3, /**< Candle light */ - V4L2_SCENE_MODE_DAWN_DUSK = 4, /**< Dawn dask */ - V4L2_SCENE_MODE_FALL_COLORS = 5, /**< Fall colors */ - V4L2_SCENE_MODE_FIREWORKS = 6, /**< Fire works */ - V4L2_SCENE_MODE_LANDSCAPE = 7, /**< Landscape */ - V4L2_SCENE_MODE_NIGHT = 8, /**< Night */ - V4L2_SCENE_MODE_PARTY_INDOOR = 9, /**< Indoor party */ - V4L2_SCENE_MODE_PORTRAIT = 10, /**< Portrait */ - V4L2_SCENE_MODE_SPORTS = 11, /**< Sports */ - V4L2_SCENE_MODE_SUNSET = 12, /**< Sunset */ - V4L2_SCENE_MODE_TEXT = 13 /**< Text */ + V4L2_SCENE_MODE_NONE = 0, /* No scene */ + V4L2_SCENE_MODE_BACKLIGHT = 1, /* Backlight */ + V4L2_SCENE_MODE_BEACH_SNOW = 2, /* Beach snow */ + V4L2_SCENE_MODE_CANDLE_LIGHT = 3, /* Candle light */ + V4L2_SCENE_MODE_DAWN_DUSK = 4, /* Dawn dask */ + V4L2_SCENE_MODE_FALL_COLORS = 5, /* Fall colors */ + V4L2_SCENE_MODE_FIREWORKS = 6, /* Fire works */ + V4L2_SCENE_MODE_LANDSCAPE = 7, /* Landscape */ + V4L2_SCENE_MODE_NIGHT = 8, /* Night */ + V4L2_SCENE_MODE_PARTY_INDOOR = 9, /* Indoor party */ + V4L2_SCENE_MODE_PORTRAIT = 10, /* Portrait */ + V4L2_SCENE_MODE_SPORTS = 11, /* Sports */ + V4L2_SCENE_MODE_SUNSET = 12, /* Sunset */ + V4L2_SCENE_MODE_TEXT = 13 /* Text */ }; -#define V4L2_CID_3A_LOCK (17) /**< Lock 3A */ -#define V4L2_LOCK_EXPOSURE (1 << 0) /**< Exposure bit for +#define V4L2_CID_3A_LOCK (17) /* Lock 3A */ +#define V4L2_LOCK_EXPOSURE (1 << 0) /* Exposure bit for * V4L2_CID_3A_LOCK */ -#define V4L2_LOCK_WHITE_BALANCE (1 << 1) /**< White balance bit for +#define V4L2_LOCK_WHITE_BALANCE (1 << 1) /* White balance bit for * V4L2_CID_3A_LOCK */ -#define V4L2_LOCK_FOCUS (1 << 2) /**< Focus bit for +#define V4L2_LOCK_FOCUS (1 << 2) /* Focus bit for * V4L2_CID_3A_LOCK */ -#define V4L2_CID_AUTO_FOCUS_START (18) /**< Start single AF */ -#define V4L2_CID_AUTO_FOCUS_STOP (19) /**< Stop single AF */ +#define V4L2_CID_AUTO_FOCUS_START (18) /* Start single AF */ +#define V4L2_CID_AUTO_FOCUS_STOP (19) /* Stop single AF */ -#define V4L2_CID_3A_PARAMETER (20) /**< 3A parameter */ -#define V4L2_CID_3A_STATUS (21) /**< 3A status */ -#define V4L2_3A_STATUS_STABLE (0) /**< 3A is stable */ -#define V4L2_3A_STATUS_AE_OPERATING (1 << 0) /**< AE is operating */ -#define V4L2_3A_STATUS_AWB_OPERATING (1 << 1) /**< AWB is operating */ -#define V4L2_3A_STATUS_AF_OPERATING (1 << 2) /**< AF is operating */ +#define V4L2_CID_3A_PARAMETER (20) /* 3A parameter */ +#define V4L2_CID_3A_STATUS (21) /* 3A status */ +#define V4L2_3A_STATUS_STABLE (0) /* 3A is stable */ +#define V4L2_3A_STATUS_AE_OPERATING (1 << 0) /* AE is operating */ +#define V4L2_3A_STATUS_AWB_OPERATING (1 << 1) /* AWB is operating */ +#define V4L2_3A_STATUS_AF_OPERATING (1 << 2) /* AF is operating */ -/** Spot position in spot exposure metering */ +/* Spot position in spot exposure metering */ #define V4L2_CID_EXPOSURE_METERING_SPOT_POSITION (22) -/** Flash and privacy (indicator) light controls */ +/* Flash and privacy (indicator) light controls */ #define V4L2_CID_FLASH_LED_MODE (0) -/** Enumeration for V4L2_CID_FLASH_LED_MODE */ +/* Enumeration for V4L2_CID_FLASH_LED_MODE */ enum v4l2_flash_led_mode { - V4L2_FLASH_LED_MODE_NONE, /**< Not use LED */ - V4L2_FLASH_LED_MODE_FLASH, /**< Flash mode */ - V4L2_FLASH_LED_MODE_TORCH, /**< Torch mode */ + V4L2_FLASH_LED_MODE_NONE, /* Not use LED */ + V4L2_FLASH_LED_MODE_FLASH, /* Flash mode */ + V4L2_FLASH_LED_MODE_TORCH, /* Torch mode */ }; /* JPEG-class control IDs */ -#define V4L2_CID_JPEG_COMPRESSION_QUALITY (0) /**< JPEG quality */ +#define V4L2_CID_JPEG_COMPRESSION_QUALITY (0) /* JPEG quality */ #endif /* __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H */ diff --git a/include/stdint.h b/include/stdint.h index 42cd716d21..a6d8654970 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -125,8 +125,8 @@ /* Limits of sig_atomic_t type */ -#define SIG_ATOMIC_MIN INT32_MIN -#define SIG_ATOMIC_MAX INT32_MAX +#define SIG_ATOMIC_MIN INT32_MIN +#define SIG_ATOMIC_MAX INT32_MAX /* Limits of greatest-width integer types */ diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index eb989e5fa9..adfb8313b5 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -94,13 +94,13 @@ /* 32-bit modular arithmetics for tcp sequence numbers */ -#define TCP_SEQ_LT(a, b) ((int32_t)((a) - (b)) < 0) -#define TCP_SEQ_GT(a, b) TCP_SEQ_LT(b, a) -#define TCP_SEQ_LTE(a, b) (!TCP_SEQ_GT(a, b)) -#define TCP_SEQ_GTE(a, b) (!TCP_SEQ_LT(a, b)) +#define TCP_SEQ_LT(a, b) ((int32_t)((a) - (b)) < 0) +#define TCP_SEQ_GT(a, b) TCP_SEQ_LT(b, a) +#define TCP_SEQ_LTE(a, b) (!TCP_SEQ_GT(a, b)) +#define TCP_SEQ_GTE(a, b) (!TCP_SEQ_LT(a, b)) -#define TCP_SEQ_ADD(a, b) ((uint32_t)((a) + (b))) -#define TCP_SEQ_SUB(a, b) ((uint32_t)((a) - (b))) +#define TCP_SEQ_ADD(a, b) ((uint32_t)((a) + (b))) +#define TCP_SEQ_SUB(a, b) ((uint32_t)((a) - (b))) /* The TCP options flags */