X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/e5c3c8accffbcd77fea12ccf2b0accc70c645aaa..8328d66ad5de53d630db5b32a155404181733843:/lunaix-os/kernel/proc0.c?ds=sidebyside

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index f926ffd..2a41032 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -10,11 +10,13 @@
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
+#include <lunaix/peripheral/serial.h>
 #include <lunaix/proc.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/types.h>
+#include <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
@@ -50,7 +52,8 @@ __do_reserved_memory(int unlock);
 // #define DEMO_SIGNAL
 // #define DEMO_READDIR
 // #define DEMO_IOTEST
-#define DEMO_INPUT_TEST
+// #define DEMO_INPUT_TEST
+#define DEMO_SIMPLE_SH
 
 extern void
 _pconsole_main();
@@ -70,6 +73,9 @@ _iotest_main();
 extern void
 input_test();
 
+extern void
+sh_main();
+
 void __USER__
 __proc0_usr()
 {
@@ -95,6 +101,8 @@ __proc0_usr()
         _iotest_main();
 #elif defined DEMO_INPUT_TEST
         input_test();
+#elif defined DEMO_SIMPLE_SH
+        sh_main();
 #else
         _lxinit_main();
 #endif
@@ -155,6 +163,8 @@ init_platform()
     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
+    serial_init();
+    sdbg_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
@@ -167,12 +177,17 @@ init_platform()
     console_start_flushing();
     console_flush();
 
+    cake_export();
     unlock_reserved_memory();
 
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
         vmm_del_mapping(PD_REFERENCED, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
     }
+
+    for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
+        vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP);
+    }
 }
 
 void