aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude
diff options
context:
space:
mode:
authorErwan Velu <erwan.velu@free.fr>2009-12-01 16:26:16 +0100
committerErwan Velu <erwan.velu@free.fr>2009-12-04 10:19:00 +0100
commit62ea3bbf5cde3a708bb95e754d6eb9d73e9ef30b (patch)
tree7b86c18dc1510a4fc0a72b0226ad03d77e8f4494 /com32/gplinclude
parent92d4e25dc8e1d4efee83ec6062dff61f6307ab0e (diff)
downloadsyslinux-62ea3bbf5cde3a708bb95e754d6eb9d73e9ef30b.tar.gz
syslinux-62ea3bbf5cde3a708bb95e754d6eb9d73e9ef30b.tar.xz
syslinux-62ea3bbf5cde3a708bb95e754d6eb9d73e9ef30b.zip
acpi: Fixing parsing
Impact: none Parsing have to be done the spec says ;) Let's found the RSDP first
Diffstat (limited to 'com32/gplinclude')
-rw-r--r--com32/gplinclude/acpi/acpi.h16
-rw-r--r--com32/gplinclude/acpi/madt.h3
-rw-r--r--com32/gplinclude/acpi/rsdp.h35
3 files changed, 47 insertions, 7 deletions
diff --git a/com32/gplinclude/acpi/acpi.h b/com32/gplinclude/acpi/acpi.h
index 53e5b674..4a83fbd1 100644
--- a/com32/gplinclude/acpi/acpi.h
+++ b/com32/gplinclude/acpi/acpi.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 2006 Erwan Velu - All Rights Reserved
+ * Copyright 2009 Erwan Velu - All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,19 +14,23 @@
#define ACPI_H
#include <inttypes.h>
#include <stdbool.h>
+#include <acpi/rsdp.h>
#include <acpi/madt.h>
enum { ACPI_FOUND, ENO_ACPI, MADT_FOUND, ENO_MADT };
+/* This macro are used to extract ACPI structures
+ * please be careful about the q (interator) naming */
+#define cp_struct(dest) memcpy(dest,q,sizeof(*dest)); q+=sizeof(*dest)
+#define cp_str_struct(dest) memcpy(dest,q,sizeof(dest)-1); dest[sizeof(dest)-1]=0;q+=sizeof(dest)-1
+
typedef struct {
+ s_rsdp rsdp;
s_madt madt;
- uint64_t base_address;
- uint64_t size;
- bool madt_valid;
- bool acpi_valid;
} s_acpi;
-int search_acpi(s_acpi * acpi);
+int parse_acpi(s_acpi * acpi);
int search_madt(s_acpi * acpi);
+int search_rsdp(s_acpi * acpi);
void print_madt(s_acpi * acpi);
#endif
diff --git a/com32/gplinclude/acpi/madt.h b/com32/gplinclude/acpi/madt.h
index 10e0d429..cb623a48 100644
--- a/com32/gplinclude/acpi/madt.h
+++ b/com32/gplinclude/acpi/madt.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 2006 Erwan Velu - All Rights Reserved
+ * Copyright 2009 Erwan Velu - All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -51,6 +51,7 @@ typedef struct {
uint32_t flags;
s_processor_local_apic processor_local_apic[MAX_SLP];
uint8_t processor_local_apic_count;
+ bool valid;
} s_madt;
#endif
diff --git a/com32/gplinclude/acpi/rsdp.h b/com32/gplinclude/acpi/rsdp.h
new file mode 100644
index 00000000..df4da2d8
--- /dev/null
+++ b/com32/gplinclude/acpi/rsdp.h
@@ -0,0 +1,35 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2009 Erwan Velu - All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ * Boston MA 02111-1307, USA; either version 2 of the License, or
+ * (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+#ifndef RSDP_H
+#define RSDP_H
+#include <inttypes.h>
+#include <stdbool.h>
+
+#define RSDP_MIN_ADDRESS 0x0E0000
+#define RSDP_MAX_ADDRESS 0x0FFFFF
+enum { RSDP_TABLE_FOUND };
+
+typedef struct {
+ uint64_t address;
+ uint8_t signature[8 + 1];
+ uint8_t checksum;
+ uint8_t oem_id[6 + 1];
+ uint8_t revision;
+ uint32_t rsdt_address;
+ uint32_t length;
+ uint32_t xsdt_address;
+ uint8_t extended_checksum;
+ bool valid;
+} s_rsdp;
+
+#endif