Be sure to add "void" to all function prototypes that take no args.

[seabios.git] / src / acpi.h

diff --git a/src/acpi.h b/src/acpi.h
index a5c58b5125a9dd6d4a21368748fcfefc20b3ee21..c3ae84cf4724a58ad98dddff0362926b4575b8e1 100644 (file)
--- a/src/acpi.h
+++ b/src/acpi.h
@@ -4,34 +4,22 @@
 #include "types.h" // u32
 
 void acpi_bios_init(void);
+u32 find_resume_vector(void);
 
 #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "
 
-struct rsdp_descriptor         /* Root System Descriptor Pointer */
-{
-       u8                            signature [8];          /* ACPI signature, contains "RSD PTR " */
-       u8                              checksum;               /* To make sum of struct == 0 */
-       u8                            oem_id [6];             /* OEM identification */
-       u8                              revision;               /* Must be 0 for 1.0, 2 for 2.0 */
-       u32                             rsdt_physical_address;  /* 32-bit physical address of RSDT */
-       u32                             length;                 /* XSDT Length in bytes including hdr */
-       u64                             xsdt_physical_address;  /* 64-bit physical address of XSDT */
-       u8                              extended_checksum;      /* Checksum of entire table */
-       u8                            reserved [3];           /* Reserved field must be 0 */
+struct rsdp_descriptor {        /* Root System Descriptor Pointer */
+    u64 signature;              /* ACPI signature, contains "RSD PTR " */
+    u8  checksum;               /* To make sum of struct == 0 */
+    u8  oem_id [6];             /* OEM identification */
+    u8  revision;               /* Must be 0 for 1.0, 2 for 2.0 */
+    u32 rsdt_physical_address;  /* 32-bit physical address of RSDT */
+    u32 length;                 /* XSDT Length in bytes including hdr */
+    u64 xsdt_physical_address;  /* 64-bit physical address of XSDT */
+    u8  extended_checksum;      /* Checksum of entire table */
+    u8  reserved [3];           /* Reserved field must be 0 */
 };
 
-// XXX - not really part of acpi.
-struct mptable_floating_s {
-    u32 signature;
-    u32 physaddr;
-    u8 length;
-    u8 spec_rev;
-    u8 checksum;
-    u8 feature1;
-    u8 feature2;
-    u8 reserved[3];
-};
-
-#define MPTABLE_SIGNAURE 0x5f504d5f  // "_MP_"
+extern struct rsdp_descriptor *RsdpAddr;
 
 #endif // acpi.h