feat: readdir fix and demo

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 3a6ea62116aea40654d96c93ee97a39ac8c1167f..4cf0c82abab874365577b2e25d3cad8d8703bc6c 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,8 +1,12 @@
 #include <arch/x86/boot/multiboot.h>
 #include <lunaix/common.h>
 #include <arch/x86/boot/multiboot.h>
 #include <lunaix/common.h>

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

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

+#include <lunaix/mm/cake.h>

 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/pmm.h>

+#include <lunaix/mm/valloc.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>


@@ -12,11 +16,13 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>

-#include <hal/ahci.h>
+#include <hal/ahci/ahci.h>

 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 

+#include <klibc/string.h>
+

 LOG_MODULE("PROC0")
 
 extern void
 LOG_MODULE("PROC0")
 
 extern void


@@ -34,8 +40,9 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

-//#define USE_DEMO
-#define DEMO_SIGNAL
+#define USE_DEMO
+// #define DEMO_SIGNAL
+#define DEMO_READDIR

 
 extern void
 _pconsole_main();
 
 extern void
 _pconsole_main();


@@ -46,6 +53,9 @@ _signal_demo_main();
 extern void
 _lxinit_main();
 
 extern void
 _lxinit_main();
 

+extern void
+_readdir_main();
+

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


@@ -59,6 +69,8 @@ __proc0_usr()
         _exit(0);
 #elif defined DEMO_SIGNAL
         _signal_demo_main();
         _exit(0);
 #elif defined DEMO_SIGNAL
         _signal_demo_main();

+#elif defined DEMO_READDIR
+        _readdir_main();

 #else
         _lxinit_main();
 #endif
 #else
         _lxinit_main();
 #endif


@@ -107,14 +119,48 @@ extern uint8_t __kernel_end;              /* link/linker.ld */
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 

+char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
+                       "There were two regal sisters who ruled together "
+                       "and created harmony for all the land.";
+

 void
 void

-init_platform()
+__test_disk_io()

 {
 {

-    assert_msg(kalloc_init(), "Fail to initialize heap");
+    struct hba_port* port = ahci_get_port(0);
+    struct hba_device* dev = port->device;
+    char* buffer = vzalloc_dma(port->device->block_size);
+    strcpy(buffer, test_sequence);
+    kprintf("WRITE: %s\n", buffer);
+    int result;
+
+    // 写入第一扇区 (LBA=0)
+    result = dev->ops.write_buffer(dev, 0, buffer, dev->block_size);
+    if (!result) {
+        kprintf(KWARN "fail to write: %x\n", dev->last_error);
+    }
+
+    memset(buffer, 0, dev->block_size);

 
 

+    // 读出我们刚刚写的内容！
+    result = dev->ops.read_buffer(dev, 0, buffer, dev->block_size);
+    kprintf(KDEBUG "%x, %x\n", port->regs[HBA_RPxIS], port->regs[HBA_RPxTFD]);
+    if (!result) {
+        kprintf(KWARN "fail to read: %x\n", dev->last_error);
+    } else {
+        kprint_hex(buffer, 256);
+    }
+
+    vfree_dma(buffer);
+}
+
+void
+init_platform()
+{

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

+    assert_msg(kalloc_init(), "Fail to initialize heap");
+

     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();


@@ -123,8 +169,17 @@ init_platform()
     ps2_kbd_init();
     pci_init();
     ahci_init();
     ps2_kbd_init();
     pci_init();
     ahci_init();

-    pci_print_device();
-    ahci_list_device();
+    // ahci_list_device();
+
+    fsm_init();
+    vfs_init();
+    twifs_init();
+
+    vfs_mount("/", "twifs", -1);
+
+    //__test_disk_io();
+
+    // cake_stats();

 
     syscall_install();
 
 
     syscall_install();