[drivers/ipc] fix the recursive including if legacy enabled

14 files changed, 20 insertions, 16 deletions

diff --git a/components/drivers/include/ipc/completion.h b/components/drivers/include/ipc/completion.h
index e05bc80d11..bdddbb6d83 100644
--- a/components/drivers/include/ipc/completion.h
+++ b/components/drivers/include/ipc/completion.h
@@ -9,7 +9,8 @@
 #ifndef COMPLETION_H_
 #define COMPLETION_H_
 
-#include <rtthread.h>
+#include <rtdef.h>
+#include <rtconfig.h>
 
 /**
  * Completion
diff --git a/components/drivers/include/ipc/dataqueue.h b/components/drivers/include/ipc/dataqueue.h
index d684fa4c79..e49c6343f9 100644
--- a/components/drivers/include/ipc/dataqueue.h
+++ b/components/drivers/include/ipc/dataqueue.h
@@ -9,7 +9,8 @@
 #ifndef DATAQUEUE_H__
 #define DATAQUEUE_H__
 
-#include <rtthread.h>
+#include <rtdef.h>
+#include <rtconfig.h>
 
 #define RT_DATAQUEUE_EVENT_UNKNOWN   0x00
 #define RT_DATAQUEUE_EVENT_POP       0x01
diff --git a/components/drivers/include/ipc/pipe.h b/components/drivers/include/ipc/pipe.h
index cf2e098517..ddef3817df 100644
--- a/components/drivers/include/ipc/pipe.h
+++ b/components/drivers/include/ipc/pipe.h
@@ -10,7 +10,8 @@
 #ifndef PIPE_H__
 #define PIPE_H__
 
-#include <rtthread.h>
+#include <rtdef.h>
+#include <rtconfig.h>
 
 /**
  * Pipe Device
diff --git a/components/drivers/include/ipc/poll.h b/components/drivers/include/ipc/poll.h
index a88e27301e..21a94e9e5a 100644
--- a/components/drivers/include/ipc/poll.h
+++ b/components/drivers/include/ipc/poll.h
@@ -11,6 +11,9 @@
 #ifndef IPC_POLL_H__
 #define IPC_POLL_H__
 
+#include <rtdef.h>
+#include <rtconfig.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/drivers/include/ipc/ringblk_buf.h b/components/drivers/include/ipc/ringblk_buf.h
index 8aa8aa1bfc..a541bdd5b0 100644
--- a/components/drivers/include/ipc/ringblk_buf.h
+++ b/components/drivers/include/ipc/ringblk_buf.h
@@ -11,6 +11,9 @@
 #ifndef _RINGBLK_BUF_H_
 #define _RINGBLK_BUF_H_
 
+#include <rtdef.h>
+#include <rtconfig.h>
+
 /*
  * Introduction:
  * The rbb is the ring buffer which is composed with many blocks. It is different from the ring buffer.
diff --git a/components/drivers/include/ipc/ringbuffer.h b/components/drivers/include/ipc/ringbuffer.h
index bafe72aa64..dc6219efdd 100644
--- a/components/drivers/include/ipc/ringbuffer.h
+++ b/components/drivers/include/ipc/ringbuffer.h
@@ -10,12 +10,13 @@
 #ifndef RINGBUFFER_H__
 #define RINGBUFFER_H__
 
+#include <rtdef.h>
+#include <rtconfig.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <rtthread.h>
-
 /* ring buffer */
 struct rt_ringbuffer
 {
diff --git a/components/drivers/include/ipc/waitqueue.h b/components/drivers/include/ipc/waitqueue.h
index 8099971e03..05ee5e0813 100644
--- a/components/drivers/include/ipc/waitqueue.h
+++ b/components/drivers/include/ipc/waitqueue.h
@@ -12,7 +12,8 @@
 #ifndef WAITQUEUE_H__
 #define WAITQUEUE_H__
 
-#include <rtthread.h>
+#include <rtdef.h>
+#include <rtconfig.h>
 
 #define RT_WQ_FLAG_CLEAN    0x00
 #define RT_WQ_FLAG_WAKEUP   0x01
@@ -51,7 +52,6 @@ void rt_wqueue_wakeup(rt_wqueue_t *queue, void *key);
     struct rt_wqueue_node name = {                      \
         rt_current_thread,                              \
         RT_LIST_OBJECT_INIT(((name).list)),             \
-                                                        \
         function,                                       \
         0                                               \
     }
diff --git a/components/drivers/include/ipc/workqueue.h b/components/drivers/include/ipc/workqueue.h
index 273d144a33..9d30cd3f34 100644
--- a/components/drivers/include/ipc/workqueue.h
+++ b/components/drivers/include/ipc/workqueue.h
@@ -11,7 +11,8 @@
 #ifndef WORKQUEUE_H__
 #define WORKQUEUE_H__
 
-#include <rtthread.h>
+#include <rtdef.h>
+#include <rtconfig.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/drivers/ipc/completion.c b/components/drivers/ipc/completion.c
index c581d83d8c..d8c90429af 100644
--- a/components/drivers/ipc/completion.c
+++ b/components/drivers/ipc/completion.c
@@ -10,7 +10,6 @@
  */
 
 #include <rthw.h>
-#include <rtthread.h>
 #include <rtdevice.h>
 
 #define RT_COMPLETED    1
diff --git a/components/drivers/ipc/dataqueue.c b/components/drivers/ipc/dataqueue.c
index ca0426b798..36c381d136 100644
--- a/components/drivers/ipc/dataqueue.c
+++ b/components/drivers/ipc/dataqueue.c
@@ -9,9 +9,8 @@
  * 2016-10-31     armink       fix some resume push and pop thread bugs
  */
 
-#include <rtthread.h>
-#include <rtdevice.h>
 #include <rthw.h>
+#include <rtdevice.h>
 
 #define DATAQUEUE_MAGIC  0xbead0e0e
 
diff --git a/components/drivers/ipc/ringblk_buf.c b/components/drivers/ipc/ringblk_buf.c
index cee28e12a2..719865ac5c 100644
--- a/components/drivers/ipc/ringblk_buf.c
+++ b/components/drivers/ipc/ringblk_buf.c
@@ -9,7 +9,6 @@
  */
 
 #include <rthw.h>
-#include <rtthread.h>
 #include <rtdevice.h>
 
 /**
diff --git a/components/drivers/ipc/ringbuffer.c b/components/drivers/ipc/ringbuffer.c
index 3374b913b1..138eff055e 100644
--- a/components/drivers/ipc/ringbuffer.c
+++ b/components/drivers/ipc/ringbuffer.c
@@ -12,7 +12,6 @@
  * 2021-08-14     Jackistang   add comments for function interface.
  */
 
-#include <rtthread.h>
 #include <rtdevice.h>
 #include <string.h>
 
diff --git a/components/drivers/ipc/waitqueue.c b/components/drivers/ipc/waitqueue.c
index 7751a9406f..44554700c6 100644
--- a/components/drivers/ipc/waitqueue.c
+++ b/components/drivers/ipc/waitqueue.c
@@ -11,10 +11,8 @@
  */
 
 #include <stdint.h>
-
 #include <rthw.h>
 #include <rtdevice.h>
-#include <rtservice.h>
 
 /**
  * @brief    This function will insert a node to the wait queue.
diff --git a/components/drivers/ipc/workqueue.c b/components/drivers/ipc/workqueue.c
index a77d745514..9f688d230f 100644
--- a/components/drivers/ipc/workqueue.c
+++ b/components/drivers/ipc/workqueue.c
@@ -12,7 +12,6 @@
  */
 
 #include <rthw.h>
-#include <rtthread.h>
 #include <rtdevice.h>
 
 #ifdef RT_USING_HEAP