Skip to content

[components/drivers] 修复数据类型不匹配的问题 #2009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2018
Merged

[components/drivers] 修复数据类型不匹配的问题 #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cf8089
[components/drivers/audio] [修复] 编译警告
murphyzhao Nov 24, 2018
7556ab8
[components/drivers/audio] [修复] audio 中枚举类型不匹配的问题
murphyzhao Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions components/drivers/audio/audio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand All @@ -170,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);
}

Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions components/drivers/audio/audio_pipe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions components/drivers/audio/audio_pipe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down