From db71258051c334972a0baecfaa55a2ea4894ba4a Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 21 Nov 2020 16:00:40 +0800 Subject: [PATCH 1/3] [components / drivers]fixed re-include of audio --- components/drivers/audio/audio_pipe.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/drivers/audio/audio_pipe.h b/components/drivers/audio/audio_pipe.h index 85a3eb1793..3ae3bc8498 100644 --- a/components/drivers/audio/audio_pipe.h +++ b/components/drivers/audio/audio_pipe.h @@ -12,7 +12,6 @@ /** * Pipe Device */ -#include #include #ifndef RT_PIPE_BUFSZ @@ -71,6 +70,6 @@ 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, rt_int32_t flag, rt_size_t size); void rt_audio_pipe_destroy(struct rt_audio_pipe *pipe); -#endif -#endif +#endif /* RT_USING_HEAP */ +#endif /* __AUDIO_PIPE_H__ */ From 7f1aa82a8878cc2f5c2b0b8b279b292b0aa29b87 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 21 Nov 2020 16:05:24 +0800 Subject: [PATCH 2/3] Update audio_pipe.c --- components/drivers/audio/audio_pipe.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/drivers/audio/audio_pipe.c b/components/drivers/audio/audio_pipe.c index d7c37009b6..0a6f090a83 100644 --- a/components/drivers/audio/audio_pipe.c +++ b/components/drivers/audio/audio_pipe.c @@ -9,9 +9,6 @@ */ #include -#include -#include - #include "audio_pipe.h" static void _rt_pipe_resume_writer(struct rt_audio_pipe *pipe) From 9f5d860d044a37a64e8275b185050ca21e4df304 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 21 Nov 2020 16:07:03 +0800 Subject: [PATCH 3/3] Update audio.c --- components/drivers/audio/audio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c index 846dad07cf..6614b75ff5 100644 --- a/components/drivers/audio/audio.c +++ b/components/drivers/audio/audio.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #define DBG_TAG "audio" @@ -590,7 +589,6 @@ int rt_audio_samplerate_to_speed(rt_uint32_t bitValue) speed = 192000; break; default: - break; }