X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/fef29e9e993e62f025d8cbfeb6b8d51588083b7e..7515e526342f6ee07cbe92f5a458f1c2c4a1fcaf:/lunaix-os/hal/acpi/acpi.c

diff --git a/lunaix-os/hal/acpi/acpi.c b/lunaix-os/hal/acpi/acpi.c
index a37466a..5c1eb17 100644
--- a/lunaix-os/hal/acpi/acpi.c
+++ b/lunaix-os/hal/acpi/acpi.c
@@ -6,9 +6,9 @@
 
 #include <klibc/string.h>
 
-#include "parser/madt_parser.h"
+#include "parser/parser.h"
 
-static acpi_context* toc = NULL;
+static acpi_context* ctx = NULL;
 
 LOG_MODULE("ACPI")
 
@@ -26,46 +26,41 @@ acpi_init(multiboot_info_t* mb_info)
     assert_msg(rsdp, "Fail to locate ACPI_RSDP");
     assert_msg(acpi_rsdp_validate(rsdp), "Invalid ACPI_RSDP (checksum failed)");
 
-    kprintf(KINFO "RSDP found at %p, RSDT: %p\n", rsdp, rsdp->rsdt);
-
     acpi_rsdt_t* rsdt = rsdp->rsdt;
 
-    toc = lxcalloc(1, sizeof(acpi_context));
-    assert_msg(toc, "Fail to create ACPI context");
+    ctx = lxcalloc(1, sizeof(acpi_context));
+    assert_msg(ctx, "Fail to create ACPI context");
 
-    strncpy(toc->oem_id, rsdt->header.oem_id, 6);
-    toc->oem_id[6] = '\0';
+    strncpy(ctx->oem_id, rsdt->header.oem_id, 6);
+    ctx->oem_id[6] = '\0';
 
     size_t entry_n = (rsdt->header.length - sizeof(acpi_sdthdr_t)) >> 2;
     for (size_t i = 0; i < entry_n; i++) {
         acpi_sdthdr_t* sdthdr = ((acpi_apic_t**)&(rsdt->entry))[i];
         switch (sdthdr->signature) {
             case ACPI_MADT_SIG:
-                madt_parse((acpi_madt_t*)sdthdr, toc);
+                madt_parse((acpi_madt_t*)sdthdr, ctx);
+                break;
+            case ACPI_FADT_SIG:
+                // FADT just a plain structure, no need to parse.
+                ctx->fadt = *(acpi_fadt_t*)sdthdr;
+                break;
+            case ACPI_MCFG_SIG:
+                mcfg_parse(sdthdr, ctx);
                 break;
             default:
                 break;
         }
     }
 
-    kprintf(KINFO "OEM: %s\n", toc->oem_id);
-    kprintf(KINFO "IOAPIC address: %p\n", toc->madt.ioapic->ioapic_addr);
-    kprintf(KINFO "APIC address: %p\n", toc->madt.apic_addr);
-
-    for (size_t i = 0; i < 24; i++) {
-        acpi_intso_t* intso = toc->madt.irq_exception[i];
-        if (!intso)
-            continue;
-
-        kprintf(KINFO "IRQ #%u -> GSI #%u\n", intso->source, intso->gsi);
-    }
+    kprintf(KINFO "ACPI: %s\n", ctx->oem_id);
 }
 
 acpi_context*
 acpi_get_context()
 {
-    assert_msg(toc, "ACPI is not initialized");
-    return toc;
+    assert_msg(ctx, "ACPI is not initialized");
+    return ctx;
 }
 
 int
@@ -115,11 +110,12 @@ acpi_locate_rsdp(multiboot_info_t* mb_info)
 #else
     // You know what, I just search the entire 1MiB for Celestia's sake.
     uint8_t* mem_start = 0x4000;
-    for (size_t j = 0; j < 0x100000; j += 16) {
-        uint32_t sig_low = *((uint32_t*)(mem_start + j));
+    for (; mem_start < 0x100000; mem_start += 16) {
+        uint32_t sig_low = *((uint32_t*)(mem_start));
+        // XXX: do we need to compare this as well?
         // uint32_t sig_high = *((uint32_t*)(mem_start+j) + 1);
         if (sig_low == ACPI_RSDP_SIG_L) {
-            rsdp = (acpi_rsdp_t*)(mem_start + j);
+            rsdp = (acpi_rsdp_t*)(mem_start);
             break;
         }
     }