From 07babf6db4154c8cf7411709cb3556ed8c3d3535 Mon Sep 17 00:00:00 2001
From: fslongjin <fslongjin@vip.qq.com>
Date: Tue, 22 Feb 2022 22:17:27 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E7=BB=9F=E4=B8=80=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=87=BD=E6=95=B0=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?<name>=5Finit()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/common/glib.h    | 1 +
 kernel/common/printk.c  | 2 +-
 kernel/common/printk.h  | 2 +-
 kernel/exception/irq.c  | 2 +-
 kernel/exception/irq.h  | 2 +-
 kernel/exception/trap.h | 2 +-
 kernel/main.c           | 6 +++---
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kernel/common/glib.h b/kernel/common/glib.h
index 531bb117..98dc6028 100644
--- a/kernel/common/glib.h
+++ b/kernel/common/glib.h
@@ -39,6 +39,7 @@
     })
 
 // 定义类型的缩写
+typedef unsigned int uint;
 typedef unsigned long ul;
 typedef unsigned long long int ull;
 typedef long long int ll;
diff --git a/kernel/common/printk.c b/kernel/common/printk.c
index 9567de52..80ec5832 100644
--- a/kernel/common/printk.c
+++ b/kernel/common/printk.c
@@ -19,7 +19,7 @@ int calculate_max_charNum(int len, int size)
     return len / size - 1;
 }
 
-int init_printk(const int char_size_x, const int char_size_y)
+int printk_init(const int char_size_x, const int char_size_y)
 {
     struct multiboot_tag_framebuffer_info_t info;
     int reserved;
diff --git a/kernel/common/printk.h b/kernel/common/printk.h
index 081c4b39..874ddc0e 100644
--- a/kernel/common/printk.h
+++ b/kernel/common/printk.h
@@ -61,7 +61,7 @@ char buf[4096]; //vsprintf()的缓冲区
  * @param char_size_x 字符的列坐标
  * @param char_size_y 字符的行坐标
  */
-int init_printk(const int char_size_x, const int char_size_y);
+int printk_init(const int char_size_x, const int char_size_y);
 /**
  * @brief Set the printk pos object
  * 
diff --git a/kernel/exception/irq.c b/kernel/exception/irq.c
index bdd61712..f5bbe070 100644
--- a/kernel/exception/irq.c
+++ b/kernel/exception/irq.c
@@ -112,7 +112,7 @@ void (*interrupt[24])(void)=
 /**
  * @brief 初始化中断模块
  */
-void init_irq()
+void irq_init()
 {
     init_8259A();
 }
diff --git a/kernel/exception/irq.h b/kernel/exception/irq.h
index 7d62ceb9..876123fa 100644
--- a/kernel/exception/irq.h
+++ b/kernel/exception/irq.h
@@ -18,7 +18,7 @@
 /**
  * @brief 初始化中断模块
  */
-void init_irq();
+void irq_init();
 
 
 /**
diff --git a/kernel/exception/trap.h b/kernel/exception/trap.h
index 3cb1c0ad..f7a52c88 100644
--- a/kernel/exception/trap.h
+++ b/kernel/exception/trap.h
@@ -16,7 +16,7 @@
  * @brief 初始化系统中断表
  * 
  */
-void init_sys_vector();
+void sys_vector_init();
 
 //除法错误
 void divide_error();
diff --git a/kernel/main.c b/kernel/main.c
index 988b83d3..5bd4e92a 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -65,7 +65,7 @@ void system_initialize()
 
     // 初始化printk
 
-    init_printk(8, 16);
+    printk_init(8, 16);
 
     load_TR(10); // 加载TR寄存器
     ul tss_item_addr = 0x7c00;
@@ -74,13 +74,13 @@ void system_initialize()
               tss_item_addr, tss_item_addr, tss_item_addr, tss_item_addr, tss_item_addr);
 
     // 初始化中断描述符表
-    init_sys_vector();
+    sys_vector_init();
 
     //  初始化内存管理单元
     mm_init();
 
     // 初始化中断模块
-    init_irq();
+    irq_init();
 
     // 先初始化系统调用模块
     syscall_init();