Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / kernel / proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 14e48621a356ecaba5d750868c6cde5d1ec4b45f..19f04dce4d077b59bcd7c47099071ee5dc69d7b7 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,8 +1,10 @@
 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/fctrl.h>
 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/fctrl.h>

+#include <lunaix/foptions.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>

+#include <lunaix/lunaix.h>

 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>


@@ -11,11 +13,11 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/peripheral/serial.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 <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 <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>


@@ -76,6 +78,18 @@ input_test();
 extern void
 sh_main();
 
 extern void
 sh_main();
 

+void __USER__
+__setup_dir()
+{
+    int errno;
+    mkdir("/mnt");
+    mkdir("/mnt/lunaix-os");
+
+    if ((errno = mount("/dev/sdb", "/mnt/lunaix-os", "iso9660", 0))) {
+        syslog(2, "fail mounting boot medium. (%d)\n", errno);
+    }
+}
+

 void __USER__
 __proc0_usr()
 {
 void __USER__
 __proc0_usr()
 {


@@ -85,6 +99,8 @@ __proc0_usr()
     int fdstdout = open("/dev/tty", 0);
     int fdstdin = dup2(stdout, 1);
 
     int fdstdout = open("/dev/tty", 0);
     int fdstdin = dup2(stdout, 1);
 

+    __setup_dir();
+

     pid_t p;
 
     if (!(p = fork())) {
     pid_t p;
 
     if (!(p = fork())) {


@@ -154,6 +170,10 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
 void
 init_platform()
 {

+    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+            __VERSION__,
+            __TIME__);
+

     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 


@@ -175,10 +195,11 @@ init_platform()
 
     // peripherals & chipset features
     ps2_kbd_init();
 
     // peripherals & chipset features
     ps2_kbd_init();

-    pci_init();

     block_init();
     ahci_init();
 
     block_init();
     ahci_init();
 

+    pci_init();
+

     // console
     console_start_flushing();
     console_flush();
     // console
     console_start_flushing();
     console_flush();


@@ -193,11 +214,6 @@ init_platform()
         vmm_del_mapping(PD_REFERENCED, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
     }
         vmm_del_mapping(PD_REFERENCED, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
     }

-
-    // reserve higher half
-    for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
-        vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP);
-    }

 }
 
 void
 }
 
 void


@@ -229,6 +245,10 @@ __do_reserved_memory(int unlock)
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
         if (!unlock) {
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
         if (!unlock) {

+            kprintf("mem: freeze: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);

             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 if (_pa >= KERNEL_MM_BASE) {
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 if (_pa >= KERNEL_MM_BASE) {


@@ -242,6 +262,10 @@ __do_reserved_memory(int unlock)
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {

+            kprintf("mem: reclaim: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);

             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);