X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2803826a2373620dbfce8a5bff1e6a01dd594953..af2b981c4cc6f8e4b7050f0401dc225606836ca0:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 4cc414c..d195679 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,6 +1,7 @@
 #include <arch/x86/boot/multiboot.h>
 #include <lunaix/common.h>
 #include <lunaix/lunistd.h>
+#include <lunaix/lxconsole.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
@@ -11,8 +12,10 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
+#include <hal/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
+#include <hal/pci.h>
 
 LOG_MODULE("PROC0")
 
@@ -31,13 +34,38 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
+//#define USE_DEMO
+#define DEMO_SIGNAL
+
+extern void
+_pconsole_main();
+
+extern void
+_signal_demo_main();
+
+extern void
+_lxinit_main();
+
 void __USER__
 __proc0_usr()
 {
+    pid_t p;
     if (!fork()) {
-        asm("jmp _lxinit_main");
+        _pconsole_main();
     }
 
+    if (!(p = fork())) {
+#ifndef USE_DEMO
+        _exit(0);
+#elif defined DEMO_SIGNAL
+        _signal_demo_main();
+#else
+        _lxinit_main();
+#endif
+    }
+
+    waitpid(p, 0, 0);
+
     while (1) {
         yield();
     }
@@ -84,34 +112,24 @@ init_platform()
 {
     assert_msg(kalloc_init(), "Fail to initialize heap");
 
-    // Fuck it, I will no longer bother this little 1MiB
-    // I just release 4 pages for my APIC & IOAPIC remappings
-    // for (size_t i = 0; i < 3; i++) {
-    //     vmm_del_mapping(PD_REFERENCED, (void*)(i << PG_SIZE_BITS));
-    // }
-
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     acpi_init(_k_init_mb_info);
-    uintptr_t ioapic_addr = acpi_get_context()->madt.ioapic->ioapic_addr;
-    pmm_mark_page_occupied(
-      KERNEL_PID, FLOOR(__APIC_BASE_PADDR, PG_SIZE_BITS), 0);
-    pmm_mark_page_occupied(KERNEL_PID, FLOOR(ioapic_addr, PG_SIZE_BITS), 0);
-
-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_APIC, __APIC_BASE_PADDR, PG_PREM_RW, VMAP_NULL);
-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_IOAPIC, ioapic_addr, PG_PREM_RW, VMAP_NULL);
-
     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
+    pci_init();
+    ahci_init();
+    pci_print_device();
 
     syscall_install();
 
+    console_start_flushing();
+    console_flush();
+
     unlock_reserved_memory();
 
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {