From 36da2e2bc36b5418f957e64335014a8480c4f0a8 Mon Sep 17 00:00:00 2001 From: Alin Jerpelea Date: Mon, 25 Jan 2021 12:50:43 +0100 Subject: [PATCH] include: nuttx: analog: fix nxstyle errors Fix nxstyle errors for headers Signed-off-by: Alin Jerpelea --- include/nuttx/analog/lmp92001.h | 17 ++++---- include/nuttx/analog/ltc1867l.h | 73 ++++++++++++++++++++++++--------- 2 files changed, 62 insertions(+), 28 deletions(-) diff --git a/include/nuttx/analog/lmp92001.h b/include/nuttx/analog/lmp92001.h index d1040055f6..c70106b31a 100644 --- a/include/nuttx/analog/lmp92001.h +++ b/include/nuttx/analog/lmp92001.h @@ -52,13 +52,14 @@ ****************************************************************************/ /* IOCTL Commands ***********************************************************/ -/* Cmd: ANIOC_LMP92001_DAC_SET_REF Arg: bool value - * Cmd: ANIOC_LMP92001_DAC_UPDATEALL Arg: uint16_t value - * Cmd: ANIOC_LMP92001_ADC_SET_REF Arg: bool value - * Cmd: ANIOC_LMP92001_ADC_ENABLE Arg: lmp92001_adc_enable_e channel - * Cmd: ANIOC_LMP92001_ADC_SINGLESHOT_CONV Arg: none - * Cmd: ANIOC_LMP92001_ADC_CONTINUOUS_CONV Arg: none - * Cmd: ANIOC_LMP92001_ADC_READ_CHANNEL Arg: struct adc_msg_s *channel + +/* Cmd: ANIOC_LMP92001_DAC_SET_REF Arg: bool value + * Cmd: ANIOC_LMP92001_DAC_UPDATEALL Arg: uint16_t value + * Cmd: ANIOC_LMP92001_ADC_SET_REF Arg: bool value + * Cmd: ANIOC_LMP92001_ADC_ENABLE Arg: lmp92001_adc_enable_e channel + * Cmd: ANIOC_LMP92001_ADC_SINGLESHOT_CONV Arg: none + * Cmd: ANIOC_LMP92001_ADC_CONTINUOUS_CONV Arg: none + * Cmd: ANIOC_LMP92001_ADC_READ_CHANNEL Arg: struct adc_msg_s *channel */ #define ANIOC_LMP92001_DAC_SET_REF _ANIOC(AN_LMP92001_FIRST + 0) @@ -98,7 +99,7 @@ enum lmp92001_adc_enable_e LMP92001_ADC_EN_CH15 = 1 << 14U, LMP92001_ADC_EN_CH16 = 1 << 15U, LMP92001_ADC_EN_CH17 = 1 << 16U, - LMP92001_ADC_EN_ALL = 0x1FFFFU + LMP92001_ADC_EN_ALL = 0x1ffffu }; /**************************************************************************** diff --git a/include/nuttx/analog/ltc1867l.h b/include/nuttx/analog/ltc1867l.h index f39845bd52..ea83d94f55 100644 --- a/include/nuttx/analog/ltc1867l.h +++ b/include/nuttx/analog/ltc1867l.h @@ -50,7 +50,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* LTC1867L Configuration *******************************************/ +/* LTC1867L Configuration ***************************************************/ #define LTC1867L_CONFIG_BIT_SLP (1 << 1) #define LTC1867L_CONFIG_BIT_UNI (1 << 2) @@ -69,26 +69,59 @@ enum ltc1867l_analog_multiplexer_config_e LTC1867L_P_CH0_M_CH1 = 0, LTC1867L_P_CH2_M_CH3 = LTC1867L_CONFIG_BIT_S0, LTC1867L_P_CH4_M_CH5 = LTC1867L_CONFIG_BIT_S1, - LTC1867L_P_CH6_M_CH7 = LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH6_M_CH7 = LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_S0, LTC1867L_P_CH1_M_CH0 = LTC1867L_CONFIG_BIT_OS, - LTC1867L_P_CH3_M_CH2 = LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S0, - LTC1867L_P_CH5_M_CH4 = LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S1, - LTC1867L_P_CH7_M_CH6 = LTC1867L_CONFIG_BIT_OS |LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH3_M_CH2 = LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH5_M_CH4 = LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S1, + LTC1867L_P_CH7_M_CH6 = LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_S0, LTC1867L_P_CH0_M_GND = LTC1867L_CONFIG_BIT_SD, - LTC1867L_P_CH2_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S0, - LTC1867L_P_CH4_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S1, - LTC1867L_P_CH6_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_S0, - LTC1867L_P_CH1_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS, - LTC1867L_P_CH3_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S0, - LTC1867L_P_CH5_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S1, - LTC1867L_P_CH7_M_GND = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_S0, - LTC1867L_P_CH0_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH2_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S0 | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH4_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH6_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_S0 | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH1_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH3_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S0 | LTC1867L_CONFIG_BIT_COM, - LTC1867L_P_CH5_M_CH7COM = LTC1867L_CONFIG_BIT_SD | LTC1867L_CONFIG_BIT_OS | LTC1867L_CONFIG_BIT_S1 | LTC1867L_CONFIG_BIT_COM + LTC1867L_P_CH2_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH4_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S1, + LTC1867L_P_CH6_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH1_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS, + LTC1867L_P_CH3_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH5_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S1, + LTC1867L_P_CH7_M_GND = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_S0, + LTC1867L_P_CH0_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH2_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S0 | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH4_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH6_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_S0 | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH1_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH3_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S0 | + LTC1867L_CONFIG_BIT_COM, + LTC1867L_P_CH5_M_CH7COM = LTC1867L_CONFIG_BIT_SD | + LTC1867L_CONFIG_BIT_OS | + LTC1867L_CONFIG_BIT_S1 | + LTC1867L_CONFIG_BIT_COM }; enum ltc1867l_analog_input_mode_e @@ -130,7 +163,7 @@ begin_packed_struct struct ltc1867l_channel_config_s int ltc1867l_register(FAR const char *devpath, FAR struct spi_dev_s *spi, unsigned int devno, - FAR struct ltc1867l_channel_config_s* channel_config, + FAR struct ltc1867l_channel_config_s *channel_config, int channel_config_count); #endif /* CONFIG_ADC_LTC1867L */