Merge branch 'vfs-dev'

[lunaix-os.git] / lunaix-os / hal / acpi / acpi.c

diff --git a/lunaix-os/hal/acpi/acpi.c b/lunaix-os/hal/acpi/acpi.c
index 5c1eb17d408d95af26137acc3c24e7e4524741de..c6a566e47b713849f320920f74eeecd696bc0fdf 100644 (file)
--- a/lunaix-os/hal/acpi/acpi.c
+++ b/lunaix-os/hal/acpi/acpi.c
@@ -1,6 +1,6 @@
 #include <hal/acpi/acpi.h>
 
 #include <hal/acpi/acpi.h>
 

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

 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 


@@ -28,7 +28,7 @@ acpi_init(multiboot_info_t* mb_info)
 
     acpi_rsdt_t* rsdt = rsdp->rsdt;
 
 
     acpi_rsdt_t* rsdt = rsdp->rsdt;
 

-    ctx = lxcalloc(1, sizeof(acpi_context));
+    ctx = vzalloc(sizeof(acpi_context));

     assert_msg(ctx, "Fail to create ACPI context");
 
     strncpy(ctx->oem_id, rsdt->header.oem_id, 6);
     assert_msg(ctx, "Fail to create ACPI context");
 
     strncpy(ctx->oem_id, rsdt->header.oem_id, 6);


@@ -36,7 +36,8 @@ acpi_init(multiboot_info_t* mb_info)
 
     size_t entry_n = (rsdt->header.length - sizeof(acpi_sdthdr_t)) >> 2;
     for (size_t i = 0; i < entry_n; i++) {
 
     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];
+        acpi_sdthdr_t* sdthdr =
+          (acpi_sdthdr_t*)((acpi_apic_t**)&(rsdt->entry))[i];

         switch (sdthdr->signature) {
             case ACPI_MADT_SIG:
                 madt_parse((acpi_madt_t*)sdthdr, ctx);
         switch (sdthdr->signature) {
             case ACPI_MADT_SIG:
                 madt_parse((acpi_madt_t*)sdthdr, ctx);