aboutsummaryrefslogtreecommitdiffstats
path: root/source/include
diff options
context:
space:
mode:
Diffstat (limited to 'source/include')
-rw-r--r--source/include/acobject.h8
-rw-r--r--source/include/acpiosxf.h2
-rw-r--r--source/include/acpixf.h2
-rw-r--r--source/include/actypes.h3
-rw-r--r--source/include/acutils.h4
5 files changed, 12 insertions, 7 deletions
diff --git a/source/include/acobject.h b/source/include/acobject.h
index f2f8a1cfb112..e0f4a5259863 100644
--- a/source/include/acobject.h
+++ b/source/include/acobject.h
@@ -94,7 +94,7 @@
#define AOPOBJ_AML_CONSTANT 0x01 /* Integer is an AML constant */
#define AOPOBJ_STATIC_POINTER 0x02 /* Data is part of an ACPI table, don't delete */
-#define AOPOBJ_DATA_VALID 0x04 /* Object is intialized and data is valid */
+#define AOPOBJ_DATA_VALID 0x04 /* Object is initialized and data is valid */
#define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */
#define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */
#define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */
@@ -124,7 +124,7 @@ typedef struct acpi_object_integer
/*
* Note: The String and Buffer object must be identical through the Pointer
- * and length elements. There is code that depends on this.
+ * and Length elements. There is code that depends on this.
*
* Fields common to both Strings and Buffers
*/
@@ -389,7 +389,7 @@ typedef struct acpi_object_notify_handler
ACPI_OBJECT_COMMON_HEADER
ACPI_NAMESPACE_NODE *Node; /* Parent device */
UINT32 HandlerType; /* Type: Device/System/Both */
- ACPI_NOTIFY_HANDLER Handler; /* Handler addess */
+ ACPI_NOTIFY_HANDLER Handler; /* Handler address */
void *Context;
union acpi_operand_object *Next[2]; /* Device and System handler lists */
@@ -405,7 +405,7 @@ typedef struct acpi_object_addr_handler
ACPI_NAMESPACE_NODE *Node; /* Parent device */
void *Context;
ACPI_ADR_SPACE_SETUP Setup;
- union acpi_operand_object *RegionList; /* regions using this handler */
+ union acpi_operand_object *RegionList; /* Regions using this handler */
union acpi_operand_object *Next;
} ACPI_OBJECT_ADDR_HANDLER;
diff --git a/source/include/acpiosxf.h b/source/include/acpiosxf.h
index b79d0e6ade4e..fc9c8f0d7a54 100644
--- a/source/include/acpiosxf.h
+++ b/source/include/acpiosxf.h
@@ -275,7 +275,7 @@ AcpiOsExecute (
void
AcpiOsWaitEventsComplete (
- void *Context);
+ void);
void
AcpiOsSleep (
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 7478c789409c..70a00d7d9a20 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -48,7 +48,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20120420
+#define ACPI_CA_VERSION 0x20120518
#include "acconfig.h"
#include "actypes.h"
diff --git a/source/include/actypes.h b/source/include/actypes.h
index 4a5188544e77..53ebc91b0863 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -731,8 +731,9 @@ typedef UINT8 ACPI_ADR_SPACE_TYPE;
#define ACPI_ADR_SPACE_IPMI (ACPI_ADR_SPACE_TYPE) 7
#define ACPI_ADR_SPACE_GPIO (ACPI_ADR_SPACE_TYPE) 8
#define ACPI_ADR_SPACE_GSBUS (ACPI_ADR_SPACE_TYPE) 9
+#define ACPI_ADR_SPACE_PLATFORM_COMM (ACPI_ADR_SPACE_TYPE) 10
-#define ACPI_NUM_PREDEFINED_REGIONS 10
+#define ACPI_NUM_PREDEFINED_REGIONS 11
/*
* Special Address Spaces
diff --git a/source/include/acutils.h b/source/include/acutils.h
index e9c9b95dda1d..be568766af69 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -703,6 +703,10 @@ AcpiUtShortDivide (
/*
* utmisc
*/
+void
+UtConvertBackslashes (
+ char *Pathname);
+
const char *
AcpiUtValidateException (
ACPI_STATUS Status);