Browse Source

将usb的初始化交由init进程进行处理

fslongjin 2 years ago
parent
commit
16d6b94c46
3 changed files with 8 additions and 2 deletions
  1. 2 1
      .vscode/settings.json
  2. 2 1
      kernel/main.c
  3. 4 0
      kernel/process/process.c

+ 2 - 1
.vscode/settings.json

@@ -108,7 +108,8 @@
         "ahci.h": "c",
         "slab.h": "c",
         "boot_info.h": "c",
-        "pci.h": "c"
+        "pci.h": "c",
+        "time.h": "c"
     },
     "C_Cpp.errorSquiggles": "Enabled",
     "esbonio.sphinx.confDir": ""

+ 2 - 1
kernel/main.c

@@ -153,9 +153,10 @@ void system_initialize()
 
     // fat32_init();
     HPET_enable();
-    usb_init();
+    
     // 系统初始化到此结束,剩下的初始化功能应当放在初始内核线程中执行
     apic_timer_init();
+    
 }
 
 //操作系统内核从这里开始执行

+ 4 - 0
kernel/process/process.c

@@ -6,6 +6,7 @@
 #include <common/compiler.h>
 #include <common/libELF/elf.h>
 #include <driver/video/video.h>
+#include <driver/usb/usb.h>
 #include <exception/gate.h>
 #include <filesystem/fat32/fat32.h>
 #include <mm/slab.h>
@@ -410,7 +411,10 @@ ul initial_kernel_thread(ul arg)
     // kinfo("initial proc running...\targ:%#018lx", arg);
 
     fat32_init();
+    usb_init();
 
+
+    // 准备切换到用户态
     struct pt_regs *regs;
 
     current_pcb->thread->rip = (ul)ret_from_system_call;