X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c3f8598f7b2e540e4040955f313a7d05de715c99..003db17f7a36a8098827f40df8fedc087b5a26f6:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index bef7bb7..f2a8458 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,5 +1,7 @@
 #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/mm/cake.h>
@@ -14,11 +16,13 @@
 #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 <klibc/string.h>
+
 LOG_MODULE("PROC0")
 
 extern void
@@ -109,16 +113,47 @@ 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 */
 
+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
+__test_disk_io()
+{
+    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();
 
-    cake_init();
-
     assert_msg(kalloc_init(), "Fail to initialize heap");
-    valloc_init();
 
     acpi_init(_k_init_mb_info);
     apic_init();
@@ -128,10 +163,17 @@ init_platform()
     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();
+    // cake_stats();
 
     syscall_install();