X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2804ceee4ce65d49e9d52d0ed817317c0ac9efdc..8c06c883e7b13c115d5ff207f79d4b68fccd5ad6:/lunaix-os/hal/acpi/acpi.c

diff --git a/lunaix-os/hal/acpi/acpi.c b/lunaix-os/hal/acpi/acpi.c
index 67f5ade..67915fa 100644
--- a/lunaix-os/hal/acpi/acpi.c
+++ b/lunaix-os/hal/acpi/acpi.c
@@ -16,12 +16,12 @@ int
 acpi_rsdp_validate(acpi_rsdp_t* rsdp);
 
 acpi_rsdp_t*
-acpi_locate_rsdp(multiboot_info_t* mb_info);
+acpi_locate_rsdp();
 
 int
-acpi_init(multiboot_info_t* mb_info)
+acpi_init()
 {
-    acpi_rsdp_t* rsdp = acpi_locate_rsdp(mb_info);
+    acpi_rsdp_t* rsdp = acpi_locate_rsdp();
 
     assert_msg(rsdp, "Fail to locate ACPI_RSDP");
     assert_msg(acpi_rsdp_validate(rsdp), "Invalid ACPI_RSDP (checksum failed)");
@@ -40,16 +40,13 @@ acpi_init(multiboot_info_t* mb_info)
           (acpi_sdthdr_t*)((acpi_apic_t**)&(rsdt->entry))[i];
         switch (sdthdr->signature) {
             case ACPI_MADT_SIG:
-                kprintf(KINFO "MADT: %p\n", sdthdr);
                 madt_parse((acpi_madt_t*)sdthdr, ctx);
                 break;
             case ACPI_FADT_SIG:
                 // FADT just a plain structure, no need to parse.
-                kprintf(KINFO "FADT: %p\n", sdthdr);
                 ctx->fadt = *(acpi_fadt_t*)sdthdr;
                 break;
             case ACPI_MCFG_SIG:
-                kprintf(KINFO "MCFG: %p\n", sdthdr);
                 mcfg_parse(sdthdr, ctx);
                 break;
             default:
@@ -57,7 +54,7 @@ acpi_init(multiboot_info_t* mb_info)
         }
     }
 
-    kprintf(KINFO "ACPI: %s\n", ctx->oem_id);
+    return 0;
 }
 
 acpi_context*
@@ -70,8 +67,8 @@ acpi_get_context()
 int
 acpi_rsdp_validate(acpi_rsdp_t* rsdp)
 {
-    uint8_t sum = 0;
-    uint8_t* rsdp_ptr = (uint8_t*)rsdp;
+    u8_t sum = 0;
+    u8_t* rsdp_ptr = (u8_t*)rsdp;
     for (size_t i = 0; i < 20; i++) {
         sum += *(rsdp_ptr + i);
     }
@@ -79,61 +76,34 @@ acpi_rsdp_validate(acpi_rsdp_t* rsdp)
     return sum == 0;
 }
 
-uint8_t
-acpi_gistranslate(uint8_t old_irq)
+u8_t
+acpi_gsimap(u8_t old_irq)
 {
     if (old_irq >= 24) {
         return old_irq;
     }
     acpi_intso_t* int_override = ctx->madt.irq_exception[old_irq];
-    return int_override ? (uint8_t)int_override->gsi : old_irq;
+    return int_override ? (u8_t)int_override->gsi : old_irq;
 }
 
 #define VIRTUAL_BOX_PROBLEM
 
 acpi_rsdp_t*
-acpi_locate_rsdp(multiboot_info_t* mb_info)
+acpi_locate_rsdp()
 {
     acpi_rsdp_t* rsdp = NULL;
 
-    // You can't trust memory map from multiboot in virtual box!
-    // They put ACPI RSDP in the FUCKING 0xe0000 !!!
-    // Which is reported to be free area bt multiboot!
-    // SWEET CELESTIA!!!
-#ifndef VIRTUAL_BOX_PROBLEM
-    multiboot_memory_map_t* mmap = (multiboot_memory_map_t*)mb_info->mmap_addr;
-    for (size_t i = 0, j = 0; j < mb_info->mmap_length && !rsdp;
-         i++, j += MB_MMAP_ENTRY_SIZE) {
-        multiboot_memory_map_t entry = mmap[i];
-        if (entry.type != MULTIBOOT_MEMORY_RESERVED ||
-            entry.addr_low > 0x100000) {
-            continue;
-        }
-
-        uint8_t* mem_start = entry.addr_low & ~0xf;
-        size_t len = entry.len_low;
-        for (size_t j = 0; j < len; j += 16) {
-            uint32_t sig_low = *((uint32_t*)(mem_start + j));
-            // uint32_t sig_high = *((uint32_t*)(mem_start+j) + 1);
-            if (sig_low == ACPI_RSDP_SIG_L) {
-                rsdp = (acpi_rsdp_t*)(mem_start + j);
-                break;
-            }
-        }
-    }
-#else
-    // You know what, I just search the entire 1MiB for Celestia's sake.
-    uint8_t* mem_start = 0x4000;
+    ptr_t mem_start = 0x4000;
     for (; mem_start < 0x100000; mem_start += 16) {
-        uint32_t sig_low = *((uint32_t*)(mem_start));
+        u32_t sig_low = *((u32_t*)mem_start);
         // XXX: do we need to compare this as well?
-        // uint32_t sig_high = *((uint32_t*)(mem_start+j) + 1);
+        // u32_t sig_high = *((u32_t*)(mem_start+j) + 1);
+
         if (sig_low == ACPI_RSDP_SIG_L) {
-            rsdp = (acpi_rsdp_t*)(mem_start);
+            rsdp = (acpi_rsdp_t*)mem_start;
             break;
         }
     }
-#endif
 
     return rsdp;
 }
\ No newline at end of file