summaryrefslogtreecommitdiffstats
path: root/source/include
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-06-26 19:01:10 +0000
committerjkim <jkim@FreeBSD.org>2013-06-26 19:01:10 +0000
commit7aca7201724cb02a2a0541bd3ad2c0aca23dd076 (patch)
tree274ff6113dbdc6cbbbf50dc30d0527fb9cb0fc55 /source/include
parentaf69f95bba3597db53a980597cfd371c9f6ee7cf (diff)
downloadFreeBSD-src-7aca7201724cb02a2a0541bd3ad2c0aca23dd076.zip
FreeBSD-src-7aca7201724cb02a2a0541bd3ad2c0aca23dd076.tar.gz
Import ACPICA 20130626.
Diffstat (limited to 'source/include')
-rw-r--r--source/include/acdisasm.h1
-rw-r--r--source/include/acpixf.h2
-rw-r--r--source/include/actables.h9
-rw-r--r--source/include/actypes.h7
-rw-r--r--source/include/acutils.h2
5 files changed, 12 insertions, 9 deletions
diff --git a/source/include/acdisasm.h b/source/include/acdisasm.h
index 5abf24e..84af4a6 100644
--- a/source/include/acdisasm.h
+++ b/source/include/acdisasm.h
@@ -108,6 +108,7 @@ typedef enum
ACPI_DMT_UINT56,
ACPI_DMT_UINT64,
ACPI_DMT_BUF7,
+ ACPI_DMT_BUF10,
ACPI_DMT_BUF16,
ACPI_DMT_BUF128,
ACPI_DMT_SIG,
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 9f94e52..a334b2d 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -47,7 +47,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20130517
+#define ACPI_CA_VERSION 0x20130626
#include "acconfig.h"
#include "actypes.h"
diff --git a/source/include/actables.h b/source/include/actables.h
index b16c6e3..3452a7b 100644
--- a/source/include/actables.h
+++ b/source/include/actables.h
@@ -50,6 +50,15 @@ AcpiAllocateRootTable (
UINT32 InitialTableCount);
/*
+ * tbxfroot - Root pointer utilities
+ */
+UINT8 *
+AcpiTbScanMemoryForRsdp (
+ UINT8 *StartAddress,
+ UINT32 Length);
+
+
+/*
* tbfadt - FADT parse/convert/validate
*/
void
diff --git a/source/include/actypes.h b/source/include/actypes.h
index 840c146..09ccfdf 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -680,13 +680,6 @@ typedef UINT32 ACPI_EVENT_STATUS;
#define ACPI_EVENT_FLAG_WAKE_ENABLED (ACPI_EVENT_STATUS) 0x02
#define ACPI_EVENT_FLAG_SET (ACPI_EVENT_STATUS) 0x04
-/*
- * General Purpose Events (GPE)
- */
-#define ACPI_GPE_INVALID 0xFF
-#define ACPI_GPE_MAX 0xFF
-#define ACPI_NUM_GPE 256
-
/* Actions for AcpiSetGpe, AcpiGpeWakeup, AcpiHwLowSetGpe */
#define ACPI_GPE_ENABLE 0
diff --git a/source/include/acutils.h b/source/include/acutils.h
index c79240c..c0ea533 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -903,7 +903,7 @@ AcpiUtStrtoul64 (
void
AcpiUtPrintString (
char *String,
- UINT8 MaxLength);
+ UINT16 MaxLength);
void
UtConvertBackslashes (
OpenPOWER on IntegriCloud