X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/db4d7d52fa00cc2fd3f25d971f57b73406d816ba..03944e7734220bf7e7aa7b7113bcbdf9c22808a5:/lunaix-os/kernel/proc0.c?ds=sidebyside

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 61a6dfc..582dfdd 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -14,6 +14,7 @@
 #include <hal/acpi/acpi.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
+#include <hal/pci.h>
 
 LOG_MODULE("PROC0")
 
@@ -32,19 +33,38 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
-//#define DEMO_SIGNAL
+//#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()) {
-#ifdef DEMO_SIGNAL
-        asm("jmp _signal_demo_main");
+        _pconsole_main();
+    }
+
+    if (!(p = fork())) {
+#ifndef USE_DEMO
+        _exit(0);
+#elif defined DEMO_SIGNAL
+        _signal_demo_main();
 #else
-        asm("jmp _lxinit_main");
+        _lxinit_main();
 #endif
     }
 
+    waitpid(p, 0, 0);
+
     while (1) {
         yield();
     }
@@ -95,25 +115,18 @@ init_platform()
     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();
+    pci_print_device();
 
     syscall_install();
 
     console_start_flushing();
+    console_flush();
 
     unlock_reserved_memory();