This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8405b7b4fff9c5772ae54a123c1477af6a19e0b4 Author: Xiang Xiao <[email protected]> AuthorDate: Wed Oct 26 11:39:34 2022 +0800 Fix Error: audio/cxd56.c:1945:20: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, dev->volume); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2735:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, priv->volume); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2736:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1, 0); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2737:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2, 0); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2755:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2757:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1, ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2759:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2, ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2764:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, priv->volume); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2765:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1, 0); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: audio/cxd56.c:2766:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion] cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2, 0); ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Xiang Xiao <[email protected]> --- drivers/audio/cxd56.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/audio/cxd56.c b/drivers/audio/cxd56.c index 3e7961b01a..48da3ecc87 100644 --- a/drivers/audio/cxd56.c +++ b/drivers/audio/cxd56.c @@ -209,15 +209,6 @@ enum cxd56_dma_int_e CXD56_DMA_INT_CMB = 0x20 }; -/* Volume setting IDs */ - -enum cxd56_vol_id_e -{ - CXD56_VOL_ID_MIXER_IN1, /* SDIN1_VOL */ - CXD56_VOL_ID_MIXER_IN2, /* SDIN2_VOL */ - CXD56_VOL_ID_MIXER_OUT /* DAC_VOL */ -}; - enum cxd56_pulco_ser_mode_id_e { CXD56_SER_MODE_UNKNOWN, @@ -418,7 +409,7 @@ static void cxd56_set_dma_running(cxd56_dmahandle_t handle, bool running); static void cxd56_set_mic_gains(uint8_t gain, struct cxd56_aca_pwinput_param_s *param); static void cxd56_set_mic_out_channel(FAR struct cxd56_dev_s *dev); -static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol); +static int cxd56_set_volume(enum cxd56_audio_volid_e id, int16_t vol); static void cxd56_swap_buffer_rl(uint32_t addr, uint16_t size); static void *cxd56_workerthread(pthread_addr_t pvarg); @@ -1584,7 +1575,7 @@ static void cxd56_enable_irq(bool enable) } } -static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol) +static int cxd56_set_volume(enum cxd56_audio_volid_e id, int16_t vol) { int ret; @@ -1599,13 +1590,13 @@ static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol) switch (id) { - case CXD56_VOL_ID_MIXER_IN1: + case CXD56_AUDIO_VOLID_MIXER_IN1: write_reg(REG_AC_SDIN1_VOL, vol); break; - case CXD56_VOL_ID_MIXER_IN2: + case CXD56_AUDIO_VOLID_MIXER_IN2: write_reg(REG_AC_SDIN2_VOL, vol); break; - case CXD56_VOL_ID_MIXER_OUT: + case CXD56_AUDIO_VOLID_MIXER_OUT: write_reg(REG_AC_DAC_VOL, vol); break; }
