Browse Source

Merge pull request #4055 from DavidLin1577/patch-18

[components/drivers]fixed re-include '.h' file of audio
Bernard Xiong 4 years ago
parent
commit
497806c883

+ 0 - 2
components/drivers/audio/audio.c

@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <stdio.h>
 #include <string.h>
 #include <string.h>
 #include <rthw.h>
 #include <rthw.h>
-#include <rtthread.h>
 #include <rtdevice.h>
 #include <rtdevice.h>
 
 
 #define DBG_TAG              "audio"
 #define DBG_TAG              "audio"
@@ -590,7 +589,6 @@ int rt_audio_samplerate_to_speed(rt_uint32_t bitValue)
         speed = 192000;
         speed = 192000;
         break;
         break;
     default:
     default:
-
         break;
         break;
     }
     }
 
 

+ 0 - 3
components/drivers/audio/audio_pipe.c

@@ -9,9 +9,6 @@
  */
  */
 
 
 #include <rthw.h>
 #include <rthw.h>
-#include <rtthread.h>
-#include <rtdevice.h>
-
 #include "audio_pipe.h"
 #include "audio_pipe.h"
 
 
 static void _rt_pipe_resume_writer(struct rt_audio_pipe *pipe)
 static void _rt_pipe_resume_writer(struct rt_audio_pipe *pipe)

+ 2 - 3
components/drivers/audio/audio_pipe.h

@@ -12,7 +12,6 @@
 /**
 /**
  * Pipe Device
  * Pipe Device
  */
  */
-#include <rtthread.h>
 #include <rtdevice.h>
 #include <rtdevice.h>
 
 
 #ifndef RT_PIPE_BUFSZ
 #ifndef RT_PIPE_BUFSZ
@@ -71,6 +70,6 @@ rt_err_t rt_audio_pipe_detach(struct rt_audio_pipe *pipe);
 #ifdef RT_USING_HEAP
 #ifdef RT_USING_HEAP
 rt_err_t rt_audio_pipe_create(const char *name, rt_int32_t 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);
 void rt_audio_pipe_destroy(struct rt_audio_pipe *pipe);
-#endif
-#endif
+#endif /* RT_USING_HEAP */
 
 
+#endif /* __AUDIO_PIPE_H__ */