未验证 提交 5af95401 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #4213 from mysterywolf/typo

Typo: rt_data_queue_peak() in dataqueue 
...@@ -45,7 +45,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio) ...@@ -45,7 +45,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)
dst_size = buf_info->block_size; dst_size = buf_info->block_size;
/* check replay queue is empty */ /* check replay queue is empty */
if (rt_data_queue_peak(&audio->replay->queue, (const void **)&data, &src_size) != RT_EOK) if (rt_data_queue_peek(&audio->replay->queue, (const void **)&data, &src_size) != RT_EOK)
{ {
/* ack stop event */ /* ack stop event */
if (audio->replay->event & REPLAY_EVT_STOP) if (audio->replay->event & REPLAY_EVT_STOP)
...@@ -64,7 +64,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio) ...@@ -64,7 +64,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)
/* copy data from memory pool to hardware device fifo */ /* copy data from memory pool to hardware device fifo */
while (index < dst_size) while (index < dst_size)
{ {
result = rt_data_queue_peak(&audio->replay->queue, (const void **)&data, &src_size); result = rt_data_queue_peek(&audio->replay->queue, (const void **)&data, &src_size);
if (result != RT_EOK) if (result != RT_EOK)
{ {
LOG_D("under run %d, remain %d", audio->replay->pos, remain_bytes); LOG_D("under run %d, remain %d", audio->replay->pos, remain_bytes);
......
...@@ -55,7 +55,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue, ...@@ -55,7 +55,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
const void **data_ptr, const void **data_ptr,
rt_size_t *size, rt_size_t *size,
rt_int32_t timeout); rt_int32_t timeout);
rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, rt_err_t rt_data_queue_peek(struct rt_data_queue *queue,
const void **data_ptr, const void **data_ptr,
rt_size_t *size); rt_size_t *size);
void rt_data_queue_reset(struct rt_data_queue *queue); void rt_data_queue_reset(struct rt_data_queue *queue);
......
...@@ -1268,7 +1268,7 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event) ...@@ -1268,7 +1268,7 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
tx_dma = (struct rt_serial_tx_dma*) serial->serial_tx; tx_dma = (struct rt_serial_tx_dma*) serial->serial_tx;
rt_data_queue_pop(&(tx_dma->data_queue), &last_data_ptr, &data_size, 0); rt_data_queue_pop(&(tx_dma->data_queue), &last_data_ptr, &data_size, 0);
if (rt_data_queue_peak(&(tx_dma->data_queue), &data_ptr, &data_size) == RT_EOK) if (rt_data_queue_peek(&(tx_dma->data_queue), &data_ptr, &data_size) == RT_EOK)
{ {
/* transmit next data node */ /* transmit next data node */
tx_dma->activated = RT_TRUE; tx_dma->activated = RT_TRUE;
......
...@@ -264,7 +264,7 @@ __exit: ...@@ -264,7 +264,7 @@ __exit:
} }
RTM_EXPORT(rt_data_queue_pop); RTM_EXPORT(rt_data_queue_pop);
rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, rt_err_t rt_data_queue_peek(struct rt_data_queue *queue,
const void** data_ptr, const void** data_ptr,
rt_size_t *size) rt_size_t *size)
{ {
...@@ -287,7 +287,7 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, ...@@ -287,7 +287,7 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue,
return RT_EOK; return RT_EOK;
} }
RTM_EXPORT(rt_data_queue_peak); RTM_EXPORT(rt_data_queue_peek);
void rt_data_queue_reset(struct rt_data_queue *queue) void rt_data_queue_reset(struct rt_data_queue *queue)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册