Merge branch 'master' into sata-ahci-dev

[lunaix-os.git] / lunaix-os / includes / hal / acpi / acpi.h

diff --git a/lunaix-os/includes/hal/acpi/acpi.h b/lunaix-os/includes/hal/acpi/acpi.h
index 326a8d04aad1712bee3ae15c24cdfdac914f5c14..2e788d27414f3cc0959a9c97c3ed7123e392c6aa 100644 (file)
--- a/lunaix-os/includes/hal/acpi/acpi.h
+++ b/lunaix-os/includes/hal/acpi/acpi.h
@@ -1,19 +1,29 @@
 #ifndef __LUNAIX_ACPI_ACPI_H
 #define __LUNAIX_ACPI_ACPI_H
 
-#include <stdint.h>
-#include <stddef.h>
 #include <arch/x86/boot/multiboot.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "sdt.h"
+#include "fadt.h"
 #include "madt.h"
+#include "mcfg.h"
+#include "sdt.h"
+
+// * for quick conversion from a table name into ACPI favoured signature
+// * use `echo <TableName> | xxd -eg4`
+
+#define ACPI_RSDP_SIG_L 0x20445352 // 'RSD '
+#define ACPI_RSDP_SIG_H 0x20525450 // 'PTR '
 
-#define ACPI_RSDP_SIG_L       0x20445352      // 'RSD '
-#define ACPI_RSDP_SIG_H      0x20525450       // 'PTR '
+#define ACPI_MADT_SIG 0x43495041 // 'APIC'
+#define ACPI_FADT_SIG 0x50434146 // 'FACP' Notice that it is not 'FADT'.
 
-#define ACPI_MADT_SIG        0x43495041       // 'APIC'
+// 'MCFG' (Not part of ACPI standard. See PCI Firmware Spec.)
+#define ACPI_MCFG_SIG 0x4746434d
 
-typedef struct {
+typedef struct
+{
     uint32_t signature_l;
     uint32_t signature_h;
     uint8_t chksum;
@@ -24,18 +34,20 @@ typedef struct {
     uint32_t length;
     acpi_sdthdr_t* xsdt;
     uint8_t x_chksum;
-    char reserved[3];    // Reserved field
+    char reserved[3]; // Reserved field
 } __attribute__((packed)) acpi_rsdp_t;
 
 /**
  * @brief Main TOC of ACPI tables, provide hassle-free access of ACPI info.
- * 
+ *
  */
 typedef struct
 {
     // Make it as null terminated
     char oem_id[7];
     acpi_madt_toc_t madt;
+    acpi_fadt_t fadt;
+    struct acpi_mcfg_toc mcfg;
 } acpi_context;
 
 int