diff options
| author | MurphyZhao <[email protected]> | 2018-11-24 17:37:07 +0800 |
|---|---|---|
| committer | MurphyZhao <[email protected]> | 2018-11-28 18:56:40 +0800 |
| commit | 7556ab89dac4056a51b8ec0ee46e0269bc43e83b (patch) | |
| tree | 62f300a5a972dbf6326d3e5ae9f67633d4af5823 /components/drivers | |
| parent | 3cf808921db99905daef98839f12ef9804cd69ec (diff) | |
[components/drivers/audio] [修复] audio 中枚举类型不匹配的问题
Signed-off-by: MurphyZhao <[email protected]>
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/audio/audio.c | 2 | ||||
| -rw-r--r-- | components/drivers/audio/audio_pipe.c | 4 | ||||
| -rw-r--r-- | components/drivers/audio/audio_pipe.h | 6 |
3 files changed, 6 insertions, 6 deletions
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 |