Skip to content

Commit 497806c

Browse files
authored
Merge pull request #4055 from DavidLin1577/patch-18
[components/drivers]fixed re-include '.h' file of audio
2 parents fbab9c8 + 9f5d860 commit 497806c

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

components/drivers/audio/audio.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <stdio.h>
1313
#include <string.h>
1414
#include <rthw.h>
15-
#include <rtthread.h>
1615
#include <rtdevice.h>
1716

1817
#define DBG_TAG "audio"
@@ -590,7 +589,6 @@ int rt_audio_samplerate_to_speed(rt_uint32_t bitValue)
590589
speed = 192000;
591590
break;
592591
default:
593-
594592
break;
595593
}
596594

components/drivers/audio/audio_pipe.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
*/
1010

1111
#include <rthw.h>
12-
#include <rtthread.h>
13-
#include <rtdevice.h>
14-
1512
#include "audio_pipe.h"
1613

1714
static void _rt_pipe_resume_writer(struct rt_audio_pipe *pipe)

components/drivers/audio/audio_pipe.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* Pipe Device
1414
*/
15-
#include <rtthread.h>
1615
#include <rtdevice.h>
1716

1817
#ifndef RT_PIPE_BUFSZ
@@ -71,6 +70,6 @@ rt_err_t rt_audio_pipe_detach(struct rt_audio_pipe *pipe);
7170
#ifdef RT_USING_HEAP
7271
rt_err_t rt_audio_pipe_create(const char *name, rt_int32_t flag, rt_size_t size);
7372
void rt_audio_pipe_destroy(struct rt_audio_pipe *pipe);
74-
#endif
75-
#endif
73+
#endif /* RT_USING_HEAP */
7674

75+
#endif /* __AUDIO_PIPE_H__ */

0 commit comments

Comments
 (0)