将wait_queue_head_t的定义移回wait.h

diff --git a/include/task.h b/include/task.h
index ac27a6aec5481395f557bcf19bb0992a35e2677e..6b8e1d995f28eee116a572148ceeaa8ca973899a 100644 (file)
--- a/include/task.h
+++ b/include/task.h
@@ -22,6 +22,7 @@
 #include <processor.h>
 #include <system.h>
 #include <types.h>
+#include <wait.h>
 
 enum {
     TASK_UNUSED,
@@ -34,10 +35,6 @@ enum {
 
 #define TASK_NAME_SIZE 32
 
-typedef struct wait_queue_head {
-    list_head_t task_list;
-} wait_queue_head_t;
-
 typedef union task_union {
     struct {
         unsigned long esp0; /* kernel stack */

diff --git a/include/wait.h b/include/wait.h
index 6e9d03ca4f116e0054643c5f5785d8c1ebc9318b..f985f9a263596deef2e025a12d611dc85ed19976 100644 (file)
--- a/include/wait.h
+++ b/include/wait.h
@@ -14,10 +14,15 @@
 
 #include <irq.h>
 #include <list.h>
-#include <task.h>
+
+union task_union;
+
+typedef struct wait_queue_head {
+    list_head_t task_list;
+} wait_queue_head_t;
 
 typedef struct {
-    task_union *task;
+    union task_union *task;
     list_head_t task_list;
 } wait_queue_t;