From 3cf808921db99905daef98839f12ef9804cd69ec Mon Sep 17 00:00:00 2001 From: MurphyZhao Date: Sat, 24 Nov 2018 17:31:36 +0800 Subject: [components/drivers/audio] [修复] 编译警告 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MurphyZhao --- components/drivers/audio/audio.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'components/drivers') diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c index 14dddb38ea..cb0a9b0fae 100644 --- a/components/drivers/audio/audio.c +++ b/components/drivers/audio/audio.c @@ -105,8 +105,6 @@ static rt_err_t _audio_dev_init(struct rt_device *dev) static rt_err_t _audio_dev_open(struct rt_device *dev, rt_uint16_t oflag) { - rt_err_t result = RT_EOK; - rt_base_t level; struct rt_audio_device *audio; RT_ASSERT(dev != RT_NULL); @@ -159,7 +157,6 @@ static rt_err_t _audio_dev_open(struct rt_device *dev, rt_uint16_t oflag) //init pipe for record { - rt_size_t size = CFG_AUDIO_RECORD_PIPE_SIZE; rt_uint8_t *buf = rt_malloc(CFG_AUDIO_RECORD_PIPE_SIZE); if (buf == RT_NULL) @@ -536,8 +533,6 @@ void rt_audio_tx_complete(struct rt_audio_device *audio, rt_uint8_t *pbuf) void rt_audio_rx_done(struct rt_audio_device *audio, rt_uint8_t *pbuf, rt_size_t len) { - rt_err_t result = RT_EOK; - //save data to record pipe rt_device_write(RT_DEVICE(RT_DEVICE(&audio_pipe)), 0, pbuf, len); -- cgit v1.3.1 From 7556ab89dac4056a51b8ec0ee46e0269bc43e83b Mon Sep 17 00:00:00 2001 From: MurphyZhao Date: Sat, 24 Nov 2018 17:37:07 +0800 Subject: [components/drivers/audio] [修复] audio 中枚举类型不匹配的问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MurphyZhao --- components/drivers/audio/audio.c | 2 +- components/drivers/audio/audio_pipe.c | 4 ++-- components/drivers/audio/audio_pipe.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'components/drivers') diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c index cb0a9b0fae..6a5ebc8741 100644 --- a/components/drivers/audio/audio.c +++ b/components/drivers/audio/audio.c @@ -167,7 +167,7 @@ static rt_err_t _audio_dev_open(struct rt_device *dev, rt_uint16_t oflag) return -RT_ENOMEM; } - rt_audio_pipe_init(&audio_pipe, "recpipe", RT_PIPE_FLAG_FORCE_WR | RT_PIPE_FLAG_BLOCK_RD, buf, + rt_audio_pipe_init(&audio_pipe, "recpipe", (rt_int32_t)(RT_PIPE_FLAG_FORCE_WR | RT_PIPE_FLAG_BLOCK_RD), buf, CFG_AUDIO_RECORD_PIPE_SIZE); } diff --git a/components/drivers/audio/audio_pipe.c b/components/drivers/audio/audio_pipe.c index a372ae0625..4df9fd8a49 100644 --- a/components/drivers/audio/audio_pipe.c +++ b/components/drivers/audio/audio_pipe.c @@ -213,7 +213,7 @@ const static struct rt_device_ops audio_pipe_ops = */ rt_err_t rt_audio_pipe_init(struct rt_audio_pipe *pipe, const char *name, - enum rt_audio_pipe_flag flag, + rt_int32_t flag, rt_uint8_t *buf, rt_size_t size) { @@ -258,7 +258,7 @@ rt_err_t rt_audio_pipe_detach(struct rt_audio_pipe *pipe) } #ifdef RT_USING_HEAP -rt_err_t rt_audio_pipe_create(const char *name, enum rt_audio_pipe_flag flag, rt_size_t size) +rt_err_t rt_audio_pipe_create(const char *name, rt_int32_t flag, rt_size_t size) { rt_uint8_t *rb_memptr = RT_NULL; struct rt_audio_pipe *pipe = RT_NULL; diff --git a/components/drivers/audio/audio_pipe.h b/components/drivers/audio/audio_pipe.h index c34f72b019..85a3eb1793 100644 --- a/components/drivers/audio/audio_pipe.h +++ b/components/drivers/audio/audio_pipe.h @@ -50,7 +50,7 @@ struct rt_audio_pipe /* ring buffer in pipe device */ struct rt_ringbuffer ringbuffer; - enum rt_audio_pipe_flag flag; + rt_int32_t flag; /* suspended list */ rt_list_t suspended_read_list; @@ -64,12 +64,12 @@ struct rt_audio_pipe rt_err_t rt_audio_pipe_init(struct rt_audio_pipe *pipe, const char *name, - enum rt_audio_pipe_flag flag, + rt_int32_t flag, rt_uint8_t *buf, rt_size_t size); rt_err_t rt_audio_pipe_detach(struct rt_audio_pipe *pipe); #ifdef RT_USING_HEAP -rt_err_t rt_audio_pipe_create(const char *name, enum rt_audio_pipe_flag flag, rt_size_t size); +rt_err_t rt_audio_pipe_create(const char *name, rt_int32_t flag, rt_size_t size); void rt_audio_pipe_destroy(struct rt_audio_pipe *pipe); #endif #endif -- cgit v1.3.1