From e1cbe87a2de800f47a1f50eba56e50c00fc82e27 Mon Sep 17 00:00:00 2001
From: pyao12 <patrick25yao@outlook.com>
Date: Sat, 6 Jun 2026 10:37:51 +0800
Subject: [PATCH] =?UTF-8?q?[chore]=20=E6=95=B4=E7=90=86include?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fonts/README.md                | 1 +
 include/{ => interrupt}/gdt.h  | 0
 include/{ => interrupt}/idt.h  | 0
 include/{ => interrupt}/pic.h  | 0
 include/{ => interrupt}/pit.h  | 0
 kernel/graphics/layer.cpp      | 4 ++--
 kernel/interrupt/gdt.cpp       | 2 +-
 kernel/interrupt/idt.cpp       | 4 ++--
 kernel/interrupt/pic.cpp       | 2 +-
 kernel/interrupt/pit.cpp       | 4 ++--
 kernel/main.cpp                | 8 ++++----
 kernel/scheduler/scheduler.cpp | 4 ++--
 12 files changed, 15 insertions(+), 14 deletions(-)
 rename include/{ => interrupt}/gdt.h (100%)
 rename include/{ => interrupt}/idt.h (100%)
 rename include/{ => interrupt}/pic.h (100%)
 rename include/{ => interrupt}/pit.h (100%)

diff --git a/fonts/README.md b/fonts/README.md
index de30350..173ea05 100644
--- a/fonts/README.md
+++ b/fonts/README.md
@@ -3,5 +3,6 @@
 本系统引用了下列字体：
 
 - Hankaku
+- 霞鹜文楷 Light
 
 并在相关协议下使用。
\ No newline at end of file
diff --git a/include/gdt.h b/include/interrupt/gdt.h
similarity index 100%
rename from include/gdt.h
rename to include/interrupt/gdt.h
diff --git a/include/idt.h b/include/interrupt/idt.h
similarity index 100%
rename from include/idt.h
rename to include/interrupt/idt.h
diff --git a/include/pic.h b/include/interrupt/pic.h
similarity index 100%
rename from include/pic.h
rename to include/interrupt/pic.h
diff --git a/include/pit.h b/include/interrupt/pit.h
similarity index 100%
rename from include/pit.h
rename to include/interrupt/pit.h
diff --git a/kernel/graphics/layer.cpp b/kernel/graphics/layer.cpp
index 2e87561..dd193a0 100644
--- a/kernel/graphics/layer.cpp
+++ b/kernel/graphics/layer.cpp
@@ -5,8 +5,8 @@
 #include <memory/pmm.h>
 #include <scheduler.h>
 #include <serial.h>
-#include <idt.h>
-#include <pic.h>
+#include <interrupt/idt.h>
+#include <interrupt/pic.h>
 #include <string_utils.h>
 
 // 图层列表（按 z 排序，最低在前）
diff --git a/kernel/interrupt/gdt.cpp b/kernel/interrupt/gdt.cpp
index 139446c..a570336 100644
--- a/kernel/interrupt/gdt.cpp
+++ b/kernel/interrupt/gdt.cpp
@@ -1,4 +1,4 @@
-#include <gdt.h>
+#include <interrupt/gdt.h>
 #include <common.h>
 #include <string_utils.h>
 #include <serial.h>
diff --git a/kernel/interrupt/idt.cpp b/kernel/interrupt/idt.cpp
index fe23169..a9f3d84 100644
--- a/kernel/interrupt/idt.cpp
+++ b/kernel/interrupt/idt.cpp
@@ -1,7 +1,7 @@
-#include <idt.h>
+#include <interrupt/idt.h>
 #include <common.h>
 #include <string_utils.h>
-#include <pic.h>
+#include <interrupt/pic.h>
 #include <serial.h>
 
 // isr.S 中定义的 256 个 ISR 桩函数
diff --git a/kernel/interrupt/pic.cpp b/kernel/interrupt/pic.cpp
index 038dbfd..b4af28b 100644
--- a/kernel/interrupt/pic.cpp
+++ b/kernel/interrupt/pic.cpp
@@ -1,4 +1,4 @@
-#include <pic.h>
+#include <interrupt/pic.h>
 #include <common.h>
 #include <string_utils.h>
 #include <serial.h>
diff --git a/kernel/interrupt/pit.cpp b/kernel/interrupt/pit.cpp
index a3b542d..322635e 100644
--- a/kernel/interrupt/pit.cpp
+++ b/kernel/interrupt/pit.cpp
@@ -1,7 +1,7 @@
-#include <pit.h>
+#include <interrupt/pit.h>
 #include <common.h>
 #include <string_utils.h>
-#include <pic.h>
+#include <interrupt/pic.h>
 #include <serial.h>
 
 static inline void outb(UINT16 port, UINT8 val) {
diff --git a/kernel/main.cpp b/kernel/main.cpp
index ce8cff5..cc31259 100644
--- a/kernel/main.cpp
+++ b/kernel/main.cpp
@@ -11,10 +11,10 @@
 #include <memory/heap.h>
 #include <scheduler.h>
 #include <fs.h>
-#include <gdt.h>
-#include <idt.h>
-#include <pic.h>
-#include <pit.h>
+#include <interrupt/gdt.h>
+#include <interrupt/idt.h>
+#include <interrupt/pic.h>
+#include <interrupt/pit.h>
 
 extern EFI_SYSTEM_TABLE *ST;
 
diff --git a/kernel/scheduler/scheduler.cpp b/kernel/scheduler/scheduler.cpp
index 188b330..bfcb5cf 100644
--- a/kernel/scheduler/scheduler.cpp
+++ b/kernel/scheduler/scheduler.cpp
@@ -1,6 +1,6 @@
 #include <scheduler.h>
-#include <idt.h>
-#include <pic.h>
+#include <interrupt/idt.h>
+#include <interrupt/pic.h>
 #include <memory/heap.h>
 #include <memory/pmm.h>
 #include <common.h>