feat: AHCI probing

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 92d3fd3df34478c42da249d81649b43414902e0d..d1956795bc6713d37c7a97bdf49f7a95e8f3db6a 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -12,6 +12,7 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>

+#include <hal/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>


@@ -115,27 +116,19 @@ init_platform()
     lock_reserved_memory();
 
     acpi_init(_k_init_mb_info);
     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();
     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
     pci_init();

+    ahci_init();

     pci_print_device();
 
     syscall_install();
 
     console_start_flushing();
     pci_print_device();
 
     syscall_install();
 
     console_start_flushing();

+    console_flush();

 
     unlock_reserved_memory();
 
 
     unlock_reserved_memory();