Merge pull request #4213 from mysterywolf/typo

BernardXiong · web-flow · commit 5af9540190d7 · 2020-12-31T16:30:34.000+08:00
Typo: rt_data_queue_peak() in dataqueue
diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c
@@ -45,7 +45,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)
     dst_size = buf_info->block_size;
 
     /* 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 */
         if (audio->replay->event & REPLAY_EVT_STOP)
@@ -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 */
         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)
             {
                 LOG_D("under run %d, remain %d", audio->replay->pos, remain_bytes);
diff --git a/components/drivers/include/ipc/dataqueue.h b/components/drivers/include/ipc/dataqueue.h
@@ -55,7 +55,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
                            const void          **data_ptr,
                            rt_size_t            *size,
                            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,
                             rt_size_t            *size);
 void rt_data_queue_reset(struct rt_data_queue *queue);
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
@@ -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;
 
             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 */
                 tx_dma->activated = RT_TRUE;
diff --git a/components/drivers/src/dataqueue.c b/components/drivers/src/dataqueue.c
@@ -264,7 +264,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
 }
 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,
                             rt_size_t *size)
 {
@@ -287,7 +287,7 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue,
 
     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)
 {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)`
`45`	`45`	`dst_size = buf_info->block_size;`
`46`	`46`
`47`	`47`	`/* check replay queue is empty */`
`48`		`- if (rt_data_queue_peak(&audio->replay->queue, (const void **)&data, &src_size) != RT_EOK)`
	`48`	`+ if (rt_data_queue_peek(&audio->replay->queue, (const void **)&data, &src_size) != RT_EOK)`
`49`	`49`	`{`
`50`	`50`	`/* ack stop event */`
`51`	`51`	`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`	`64`	`/* copy data from memory pool to hardware device fifo */`
`65`	`65`	`while (index < dst_size)`
`66`	`66`	`{`
`67`		`- result = rt_data_queue_peak(&audio->replay->queue, (const void **)&data, &src_size);`
	`67`	`+ result = rt_data_queue_peek(&audio->replay->queue, (const void **)&data, &src_size);`
`68`	`68`	`if (result != RT_EOK)`
`69`	`69`	`{`
`70`	`70`	`LOG_D("under run %d, remain %d", audio->replay->pos, remain_bytes);`
Original file line number	Diff line number	Diff line change
`@@ -1268,7 +1268,7 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)`
`1268`	`1268`	`tx_dma = (struct rt_serial_tx_dma*) serial->serial_tx;`
`1269`	`1269`
`1270`	`1270`	`rt_data_queue_pop(&(tx_dma->data_queue), &last_data_ptr, &data_size, 0);`
`1271`		`- if (rt_data_queue_peak(&(tx_dma->data_queue), &data_ptr, &data_size) == RT_EOK)`
	`1271`	`+ if (rt_data_queue_peek(&(tx_dma->data_queue), &data_ptr, &data_size) == RT_EOK)`
`1272`	`1272`	`{`
`1273`	`1273`	`/* transmit next data node */`
`1274`	`1274`	`tx_dma->activated = RT_TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,`
`264`	`264`	`}`
`265`	`265`	`RTM_EXPORT(rt_data_queue_pop);`
`266`	`266`
`267`		`-rt_err_t rt_data_queue_peak(struct rt_data_queue *queue,`
	`267`	`+rt_err_t rt_data_queue_peek(struct rt_data_queue *queue,`
`268`	`268`	`const void** data_ptr,`
`269`	`269`	`rt_size_t *size)`
`270`	`270`	`{`
`@@ -287,7 +287,7 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue,`
`287`	`287`
`288`	`288`	`return RT_EOK;`
`289`	`289`	`}`
`290`		`-RTM_EXPORT(rt_data_queue_peak);`
	`290`	`+RTM_EXPORT(rt_data_queue_peek);`
`291`	`291`
`292`	`292`	`void rt_data_queue_reset(struct rt_data_queue *queue)`
`293`	`293`	`{`