整理代码

xiaoyi1212 · xiaoyi1212 · commit a8c3eb20d397 · 2025-10-04T16:31:24.000+08:00
diff --git a/src/arch/x86_64/driver/gop.c b/src/arch/x86_64/driver/gop.c
@@ -1,8 +1,8 @@
 #include "gop.h"
+#include "errno.h"
 #include "boot.h"
 #include "cptype.h"
 #include "device.h"
-#include "errno.h"
 #include "heap.h"
 #include "hhdm.h"
 #include "ioctl.h"
diff --git a/src/arch/x86_64/fs/devfs.c b/src/arch/x86_64/fs/devfs.c
@@ -3,7 +3,7 @@
  * 设备虚拟文件系统
  */
 #include "devfs.h"
-#include "../../../include/device.h"
+#include "device.h"
 #include "errno.h"
 #include "kprint.h"
 #include "krlibc.h"
diff --git a/src/arch/x86_64/fs/fatfs/fatfs.c b/src/arch/x86_64/fs/fatfs/fatfs.c
@@ -1,7 +1,7 @@
 #define ALL_IMPLEMENTATION
 #include "errno.h"
-#include "fatfs/ff.h"
 #include "kprint.h"
+#include "fatfs/ff.h"
 #include "krlibc.h"
 #include "sprintf.h"
 
diff --git a/src/arch/x86_64/include/cpfs.h b/src/arch/x86_64/include/cpfs.h
@@ -2,8 +2,8 @@
 
 #define CPFS_MAX_FILE 256
 
-#include "../../../include/llist.h"
 #include "cptype.h"
+#include "llist.h"
 
 typedef struct cpfs_file {
     bool                is_dir;
diff --git a/src/arch/x86_64/include/devfs.h b/src/arch/x86_64/include/devfs.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../../include/device.h"
-#include "../../../include/llist.h"
 #include "cptype.h"
+#include "device.h"
+#include "llist.h"
 
 typedef struct device_handle *device_handle_t;
 
diff --git a/src/arch/x86_64/include/network.h b/src/arch/x86_64/include/network.h
@@ -251,8 +251,8 @@
     ((len) >= (int)sizeof(struct nlmsghdr) && (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) &&       \
      (nlh)->nlmsg_len <= (len))
 
-#include "../../../include/lock.h"
 #include "cptype.h"
+#include "lock.h"
 #include "syscall.h"
 #include "vfs.h"
 
diff --git a/src/arch/x86_64/include/pipefs.h b/src/arch/x86_64/include/pipefs.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../../include/lock.h"
 #include "cptype.h"
 #include "krlibc.h"
+#include "lock.h"
 #include "pcb.h"
 #include "vfs.h"
 
diff --git a/src/arch/x86_64/include/syscall.h b/src/arch/x86_64/include/syscall.h
@@ -222,11 +222,11 @@
 #define SYSCALL_MEMINFO 500
 #define SYSCALL_CPUINFO 501
 
-#include "../../../include/time.h"
 #include "cptype.h"
 #include "krlibc.h"
 #include "poll.h"
 #include "signal.h"
+#include "time.h"
 #include "vfs.h"
 
 struct syscall_regs {
diff --git a/src/arch/x86_64/include/vbuffer.h b/src/arch/x86_64/include/vbuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../../include/llist.h"
 #include "cptype.h"
+#include "llist.h"
 
 struct membuf {
     void  *buffer;
diff --git a/src/arch/x86_64/main.c b/src/arch/x86_64/main.c
@@ -1,4 +1,5 @@
-#include "../../include/vfs.h"
+#include "kmesg.h"
+#include "kprint.h"
 #include "acpi.h"
 #include "ahci.h"
 #include "boot.h"
@@ -20,8 +21,6 @@
 #include "iic/iic_core.h"
 #include "keyboard.h"
 #include "killer.h"
-#include "kmesg.h"
-#include "kprint.h"
 #include "krlibc.h"
 #include "modfs.h"
 #include "network.h"
@@ -42,6 +41,7 @@
 #include "terminal.h"
 #include "timer.h"
 #include "tmpfs.h"
+#include "vfs.h"
 
 // 编译器判断
 #if defined(__clang__)
diff --git a/src/arch/x86_64/net/netfs.c b/src/arch/x86_64/net/netfs.c
@@ -1,6 +1,5 @@
-#include "../../../include/llist.h"
-#include "../../../module/all_include/cp_kernel.h"
 #include "errno.h"
+#include "llist.h"
 #include "network.h"
 #include "pcb.h"
 #include "vfs.h"
diff --git a/src/driver/device.c b/src/driver/device.c
@@ -1,11 +1,10 @@
-#include "../include/device.h"
+#include "device.h"
 #include "errno.h"
 #include "frame.h"
 #include "hhdm.h"
 #include "kprint.h"
 #include "krlibc.h"
 #include "page.h"
-#include "vbuffer.h"
 
 device_t device_ctl[MAX_DEIVCE];
 
diff --git a/src/driver/pty.c b/src/driver/pty.c
@@ -1,6 +1,6 @@
 #define ALL_IMPLEMENTATION
 
-#include "../include/pty.h"
+#include "pty.h"
 #include "id_alloc.h"
 #include "ioctl.h"
 #include "kprint.h"
diff --git a/src/driver/tty.c b/src/driver/tty.c
@@ -1,17 +1,17 @@
 #include "tty.h"
+#include "klog.h"
+#include "kprint.h"
+#include "mpmc_queue.h"
 #include "atom_queue.h"
+#include "bootargs.h"
 #include "device.h"
 #include "gop.h"
 #include "ioctl.h"
 #include "keyboard.h"
-#include "klog.h"
-#include "kprint.h"
 #include "krlibc.h"
 #include "lock.h"
-#include "mpmc_queue.h"
 #include "pcb.h"
 #include "terminal.h"
-#include "bootargs.h"
 
 tty_t         *defualt_tty = NULL;
 mpmc_queue_t  *queue;
diff --git a/src/driver/urandom.c b/src/driver/urandom.c
@@ -1,4 +1,4 @@
-#include "../include/device.h"
+#include "device.h"
 #include "krlibc.h"
 #include "timer.h"
 
diff --git a/src/driver/zero.c b/src/driver/zero.c
@@ -1,4 +1,4 @@
-#include "../include/device.h"
+#include "device.h"
 #include "errno.h"
 #include "krlibc.h"
 #include "poll.h"
diff --git a/src/fs/tmpfs.c b/src/fs/tmpfs.c
@@ -1,4 +1,4 @@
-#include "../include/tmpfs.h"
+#include "tmpfs.h"
 #include "errno.h"
 #include "klog.h"
 #include "kprint.h"
diff --git a/src/fs/vfs.c b/src/fs/vfs.c
@@ -5,7 +5,7 @@
  */
 #define ALL_IMPLEMENTATION
 
-#include "../include/vfs.h"
+#include "vfs.h"
 #include "errno.h"
 #include "iso9660.h"
 #include "kprint.h"
diff --git a/src/include/device.h b/src/include/device.h
@@ -2,8 +2,8 @@
 
 #define SECTORS_ONCE 8
 
-#include "../arch/x86_64/include/vbuffer.h"
 #include "cptype.h"
+#include "vbuffer.h"
 
 typedef enum {
     DEVICE_BLOCK,
diff --git a/src/include/errno.h b/src/include/errno.h
diff --git a/src/include/id_alloc.h b/src/include/id_alloc.h
diff --git a/src/include/iso9660.h b/src/include/iso9660.h
diff --git a/src/include/klog.h b/src/include/klog.h
diff --git a/src/include/kmesg.h b/src/include/kmesg.h
diff --git a/src/include/kprint.h b/src/include/kprint.h
diff --git a/src/include/list.h b/src/include/list.h
@@ -1,8 +1,8 @@
 #ifndef PL_LIST_H
 #define PL_LIST_H
 
-#include "cptype.h"
 #include "heap.h"
+#include "cptype.h"
 
 #pragma GCC system_header
 
diff --git a/src/include/llist.h b/src/include/llist.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../arch/x86_64/include/krlibc.h"
+#include "krlibc.h"
 
 struct llist_header {
     struct llist_header *prev;
diff --git a/src/include/lock_queue.h b/src/include/lock_queue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../include/lock.h"
+#include "lock.h"
 #include "krlibc.h"
 
 typedef struct LockNode {
diff --git a/src/include/map.h b/src/include/map.h
@@ -2,8 +2,8 @@
 
 #define LOAD_FACTOR_THRESHOLD 0.75
 
-#include "../../../include/lock.h"
 #include "cptype.h"
+#include "lock.h"
 
 typedef struct map_entry {
     void             *key;
diff --git a/src/include/mpmc_queue.h b/src/include/mpmc_queue.h
diff --git a/src/include/pty.h b/src/include/pty.h
@@ -2,9 +2,9 @@
 
 #define PTY_BUFF_SIZE 4096
 
-#include "../arch/x86_64/include/errno.h"
-#include "../arch/x86_64/include/tty.h"
+#include "errno.h"
 #include "llist.h"
+#include "tty.h"
 #include "vfs.h"
 
 typedef struct pty_handle {
diff --git a/src/include/tty.h b/src/include/tty.h
diff --git a/src/include/vfs.h b/src/include/vfs.h
@@ -62,8 +62,8 @@
 #define O_TMPFILE   020200000
 #define O_NDELAY    O_NONBLOCK
 
-#include "../arch/x86_64/include/list.h"
 #include "cptype.h"
+#include "list.h"
 #include "llist.h"
 
 typedef struct vfs_node *vfs_node_t;
diff --git a/src/util/id_alloc.c b/src/util/id_alloc.c
@@ -17,7 +17,7 @@ void id_allocator_create(uint32_t max_ids) {
     alloc->max_ids    = max_ids;
     alloc->free_count = max_ids;
     alloc->next_id    = 0;
-    allocator = alloc;
+    allocator         = alloc;
 }
 
 int32_t id_alloc() {
@@ -50,7 +50,7 @@ bool id_free(uint32_t id) {
     uint32_t word_index = id / BITS_PER_WORD;
     uint32_t bit_index  = id % BITS_PER_WORD;
     uint32_t mask       = 1U << bit_index;
- if (allocator->bitmap[word_index] & mask) {
+    if (allocator->bitmap[word_index] & mask) {
         allocator->bitmap[word_index] &= ~mask;
         allocator->free_count++;
         return true;
diff --git a/src/util/lock_queue.c b/src/util/lock_queue.c
diff --git a/src/util/mpmc_queue.c b/src/util/mpmc_queue.c
@@ -1,6 +1,6 @@
 #include "mpmc_queue.h"
-#include "heap.h"
 #include "kprint.h"
+#include "heap.h"
 #include "krlibc.h"
 
 status_code_t get(mpmc_queue_t *queue, queue_entry_t *entry) {
diff --git a/src/util/rbtree.c b/src/util/rbtree.c
@@ -1,4 +1,4 @@
-#include "../include/rbtree.h"
+#include "rbtree.h"
 
 static void __rb_rotate_left(struct rb_node *node, struct rb_root *root) {
     struct rb_node *right  = node->rb_right;
