summaryrefslogtreecommitdiffstats
path: root/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/acpibin/Makefile1
-rw-r--r--source/tools/acpiexec/Makefile2
-rw-r--r--source/tools/acpiexec/aecommon.h1
-rw-r--r--source/tools/acpiexec/aeexec.c52
-rw-r--r--source/tools/acpiexec/aemain.c6
-rw-r--r--source/tools/acpiexec/aetables.h72
-rw-r--r--source/tools/acpihelp/Makefile6
-rw-r--r--source/tools/acpihelp/acpihelp.h5
-rw-r--r--source/tools/acpihelp/ahdecode.c148
-rw-r--r--source/tools/acpihelp/ahmain.c20
-rw-r--r--source/tools/acpinames/Makefile2
-rw-r--r--source/tools/acpisrc/asfile.c2
-rw-r--r--source/tools/acpisrc/astable.c1
13 files changed, 266 insertions, 52 deletions
diff --git a/source/tools/acpibin/Makefile b/source/tools/acpibin/Makefile
index f15141b..7d95f61 100644
--- a/source/tools/acpibin/Makefile
+++ b/source/tools/acpibin/Makefile
@@ -64,6 +64,7 @@ OBJECTS = \
utcache.o \
utdebug.o \
utdecode.o \
+ utexcep.o \
utglobal.o \
utlock.o \
utmath.o \
diff --git a/source/tools/acpiexec/Makefile b/source/tools/acpiexec/Makefile
index 65a1d84..4d379f5 100644
--- a/source/tools/acpiexec/Makefile
+++ b/source/tools/acpiexec/Makefile
@@ -205,6 +205,7 @@ OBJECTS = \
tbinstal.o \
tbutils.o \
tbxface.o \
+ tbxfload.o \
tbxfroot.o \
utaddress.o \
utalloc.o \
@@ -214,6 +215,7 @@ OBJECTS = \
utdecode.o \
utdelete.o \
uteval.o \
+ utexcep.o \
utglobal.o \
utids.o \
utinit.o \
diff --git a/source/tools/acpiexec/aecommon.h b/source/tools/acpiexec/aecommon.h
index 0f1b4c1..66995e7 100644
--- a/source/tools/acpiexec/aecommon.h
+++ b/source/tools/acpiexec/aecommon.h
@@ -68,6 +68,7 @@ extern BOOLEAN AcpiGbl_IgnoreErrors;
extern UINT8 AcpiGbl_RegionFillValue;
extern UINT8 AcpiGbl_UseHwReducedFadt;
extern BOOLEAN AcpiGbl_DisplayRegionAccess;
+extern BOOLEAN AcpiGbl_DoInterfaceTests;
/* Check for unexpected exceptions */
diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c
index d991b9c..6bc1381 100644
--- a/source/tools/acpiexec/aeexec.c
+++ b/source/tools/acpiexec/aeexec.c
@@ -90,7 +90,9 @@ AfInstallGpeBlock (
void);
#endif /* !ACPI_REDUCED_HARDWARE */
+extern unsigned char Ssdt2Code[];
extern unsigned char Ssdt3Code[];
+extern unsigned char Ssdt4Code[];
/******************************************************************************
@@ -527,15 +529,63 @@ AeMiscellaneousTests (
char Buffer[32];
ACPI_STATUS Status;
ACPI_STATISTICS Stats;
+ ACPI_HANDLE Handle;
#if (!ACPI_REDUCED_HARDWARE)
- ACPI_HANDLE Handle;
ACPI_VENDOR_UUID Uuid = {0, {ACPI_INIT_UUID (0,0,0,0,0,0,0,0,0,0,0)}};
UINT32 LockHandle1;
UINT32 LockHandle2;
#endif /* !ACPI_REDUCED_HARDWARE */
+ if (AcpiGbl_DoInterfaceTests)
+ {
+ /*
+ * Tests for AcpiLoadTable and AcpiUnloadParentTable
+ */
+
+ /* Attempt unload of DSDT, should fail */
+
+ Status = AcpiGetHandle (NULL, "\\_SB_", &Handle);
+ AE_CHECK_OK (AcpiGetHandle, Status);
+
+ Status = AcpiUnloadParentTable (Handle);
+ AE_CHECK_STATUS (AcpiUnloadParentTable, Status, AE_TYPE);
+
+ /* Load and unload SSDT4 */
+
+ Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
+ AE_CHECK_OK (AcpiLoadTable, Status);
+
+ Status = AcpiGetHandle (NULL, "\\_T96", &Handle);
+ AE_CHECK_OK (AcpiGetHandle, Status);
+
+ Status = AcpiUnloadParentTable (Handle);
+ AE_CHECK_OK (AcpiUnloadParentTable, Status);
+
+ /* Re-load SSDT4 */
+
+ Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
+ AE_CHECK_OK (AcpiLoadTable, Status);
+
+ /* Unload and re-load SSDT2 (SSDT2 is in the XSDT) */
+
+ Status = AcpiGetHandle (NULL, "\\_T99", &Handle);
+ AE_CHECK_OK (AcpiGetHandle, Status);
+
+ Status = AcpiUnloadParentTable (Handle);
+ AE_CHECK_OK (AcpiUnloadParentTable, Status);
+
+ Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt2Code);
+ AE_CHECK_OK (AcpiLoadTable, Status);
+
+ /* Load OEM9 table (causes table override) */
+
+ Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt3Code);
+ AE_CHECK_OK (AcpiLoadTable, Status);
+ }
+
+
AeHardwareInterfaces ();
AeGenericRegisters ();
AeSetupConfiguration (Ssdt3Code);
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index d0e980b..11d91a6 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -56,6 +56,7 @@ BOOLEAN AcpiGbl_IgnoreErrors = FALSE;
BOOLEAN AcpiGbl_DbOpt_NoRegionSupport = FALSE;
BOOLEAN AcpiGbl_DebugTimeout = FALSE;
UINT8 AcpiGbl_UseHwReducedFadt = FALSE;
+BOOLEAN AcpiGbl_DoInterfaceTests = FALSE;
static UINT8 AcpiGbl_BatchMode = 0;
static char BatchBuffer[128];
@@ -99,6 +100,7 @@ usage (void)
printf ("\n");
ACPI_OPTION ("-ef", "Enable display of final memory statistics");
+ ACPI_OPTION ("-ei", "Enable additional tests for ACPICA interfaces");
ACPI_OPTION ("-em", "Enable Interpreter Serialized Mode");
ACPI_OPTION ("-es", "Enable Interpreter Slack Mode");
ACPI_OPTION ("-et", "Enable debug semaphore timeout");
@@ -465,6 +467,10 @@ main (
#endif
break;
+ case 'i':
+ AcpiGbl_DoInterfaceTests = TRUE;
+ break;
+
case 'm':
AcpiGbl_AllMethodsSerialized = TRUE;
printf ("Enabling AML Interpreter serialized mode\n");
diff --git a/source/tools/acpiexec/aetables.h b/source/tools/acpiexec/aetables.h
index 16b3e89..e6d1122 100644
--- a/source/tools/acpiexec/aetables.h
+++ b/source/tools/acpiexec/aetables.h
@@ -71,24 +71,30 @@ static unsigned char LocalDsdtCode[] =
/* Several example SSDTs */
+/* SSDT1 is used by ASLTS; if changed here, must also be changed in dtregions.asl */
+
static unsigned char Ssdt1Code[] = /* Has method _T98 */
{
- 0x53,0x53,0x44,0x54,0x30,0x00,0x00,0x00, /* 00000000 "SSDT0..." */
- 0x01,0xB8,0x49,0x6E,0x74,0x65,0x6C,0x00, /* 00000008 "..Intel." */
- 0x4D,0x61,0x6E,0x79,0x00,0x00,0x00,0x00, /* 00000010 "Many...." */
+ 0x53,0x53,0x44,0x54,0x3E,0x00,0x00,0x00, /* 00000000 "SSDT>..." */
+ 0x02,0x08,0x49,0x6E,0x74,0x65,0x6C,0x00, /* 00000008 "..Intel." */
+ 0x73,0x73,0x64,0x74,0x31,0x00,0x00,0x00, /* 00000010 "ssdt1..." */
0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
- 0x24,0x04,0x03,0x20,0x14,0x0B,0x5F,0x54, /* 00000020 "$.. .._T" */
- 0x39,0x38,0x00,0x70,0x0A,0x04,0x60,0xA4, /* 00000028 "98.p..`." */
+ 0x20,0x06,0x12,0x20,0x14,0x19,0x5F,0x54, /* 00000020 " .. .._T" */
+ 0x39,0x38,0x01,0x70,0x0D,0x53,0x53,0x44, /* 00000028 "98.p.SSD" */
+ 0x54,0x31,0x20,0x2D,0x20,0x5F,0x54,0x39, /* 00000030 "T1 - _T9" */
+ 0x38,0x00,0x5B,0x31,0xA4,0x00 /* 00000038 "8.[1.." */
};
-static unsigned char Ssdt2Code[] = /* Has method _T99 */
+unsigned char Ssdt2Code[] = /* Has method _T99 */
{
- 0x53,0x53,0x44,0x54,0x30,0x00,0x00,0x00, /* 00000000 "SSDT0..." */
- 0x01,0xB7,0x49,0x6E,0x74,0x65,0x6C,0x00, /* 00000008 "..Intel." */
- 0x4D,0x61,0x6E,0x79,0x00,0x00,0x00,0x00, /* 00000010 "Many...." */
- 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
- 0x24,0x04,0x03,0x20,0x14,0x0B,0x5F,0x54, /* 00000020 "$.. .._T" */
- 0x39,0x39,0x00,0x70,0x0A,0x04,0x60,0xA4, /* 00000028 "99.p..`." */
+ 0x53,0x53,0x44,0x54,0x3E,0x00,0x00,0x00, /* 00000000 "SSDT>..." */
+ 0x02,0xFE,0x49,0x6E,0x74,0x65,0x6C,0x00, /* 00000008 "..Intel." */
+ 0x73,0x73,0x64,0x74,0x32,0x00,0x00,0x00, /* 00000010 "ssdt2..." */
+ 0x02,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
+ 0x20,0x06,0x12,0x20,0x14,0x19,0x5F,0x54, /* 00000020 " .. .._T" */
+ 0x39,0x39,0x06,0x70,0x0D,0x53,0x53,0x44, /* 00000028 "99.p.SSD" */
+ 0x54,0x32,0x20,0x2D,0x20,0x5F,0x54,0x39, /* 00000030 "T2 - _T9" */
+ 0x39,0x00,0x5B,0x31,0xA4,0x00 /* 00000038 "9.[1.." */
};
unsigned char Ssdt3Code[] = /* OEM9: Has method _T97 */
@@ -101,6 +107,16 @@ unsigned char Ssdt3Code[] = /* OEM9: Has method _T97 */
0x39,0x37,0x00,0x70,0x0A,0x04,0x60,0xA4, /* 00000028 "97.p..`." */
};
+unsigned char Ssdt4Code[] = /* Has method _T96 */
+{
+ 0x53,0x53,0x44,0x54,0x2D,0x00,0x00,0x00, /* 00000000 "SSDT-..." */
+ 0x02,0x2B,0x49,0x6E,0x74,0x65,0x6C,0x00, /* 00000008 ".+Intel." */
+ 0x73,0x73,0x64,0x74,0x34,0x00,0x00,0x00, /* 00000010 "ssdt4..." */
+ 0x04,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
+ 0x20,0x06,0x12,0x20,0x14,0x08,0x5F,0x54, /* 00000020 " .. .._T" */
+ 0x39,0x36,0x05,0xA4,0x00 /* 00000028 "96..." */
+};
+
/* "Hardware-Reduced" ACPI 5.0 FADT (No FACS, no ACPI hardware) */
unsigned char HwReducedFadtCode[] =
@@ -335,6 +351,38 @@ DefinitionBlock ("", "DSDT", 2, "Intel", "Many", 0x00000001)
}
}
+/* SSDT1 */
+
+DefinitionBlock ("ssdt1.aml", "SSDT", 2, "Intel", "ssdt1", 0x00000001)
+{
+ Method (_T98, 1, NotSerialized)
+ {
+ Store ("SSDT1 - _T98", Debug)
+ Return (Zero)
+ }
+}
+
+/* SSDT2 */
+
+DefinitionBlock ("ssdt2.aml", "SSDT", 2, "Intel", "ssdt2", 0x00000002)
+{
+ Method (_T99, 6, NotSerialized)
+ {
+ Store ("SSDT2 - _T99", Debug)
+ Return (Zero)
+ }
+}
+
+/* SSDT4 */
+
+DefinitionBlock ("ssdt4.aml", "SSDT", 2, "Intel", "ssdt4", 0x00000004)
+{
+ Method (_T96, 5, NotSerialized)
+ {
+ Return (Zero)
+ }
+}
+
/* Example ECDT */
[000h 0000 4] Signature : "ECDT" /* Embedded Controller Boot Resources Table */
diff --git a/source/tools/acpihelp/Makefile b/source/tools/acpihelp/Makefile
index 481f9c2..d0bcb3e 100644
--- a/source/tools/acpihelp/Makefile
+++ b/source/tools/acpihelp/Makefile
@@ -51,7 +51,8 @@ ACPICA_HEADERS = \
#
vpath %.c \
$(ACPIHELP) \
- $(ACPICA_COMMON)
+ $(ACPICA_COMMON) \
+ $(ACPICA_UTILITIES)
HEADERS = \
$(wildcard $(ACPIHELP)/*.h)
@@ -63,7 +64,8 @@ OBJECTS = \
ahdecode.o \
ahpredef.o \
ahmain.o \
- getopt.o
+ getopt.o \
+ utexcep.o
CFLAGS+= \
-D$(HOST) \
diff --git a/source/tools/acpihelp/acpihelp.h b/source/tools/acpihelp/acpihelp.h
index d1ac41d..58917c4 100644
--- a/source/tools/acpihelp/acpihelp.h
+++ b/source/tools/acpihelp/acpihelp.h
@@ -69,6 +69,7 @@
#define AH_DECODE_AML 4
#define AH_DECODE_AML_OPCODE 5
#define AH_DISPLAY_DEVICE_IDS 6
+#define AH_DECODE_EXCEPTION 7
#define AH_MAX_ASL_LINE_LENGTH 70
#define AH_MAX_AML_LINE_LENGTH 100
@@ -129,6 +130,10 @@ AhDecodeAmlOpcode (
char *Name);
void
+AhDecodeException (
+ char *Name);
+
+void
AhFindPredefinedNames (
char *Name);
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index a61eccf..8aff56a 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -46,6 +46,45 @@
#define ACPI_CREATE_PREDEFINED_TABLE
#include "acpredef.h"
+
+/* Device IDs defined in the ACPI specification */
+
+static const AH_DEVICE_ID AhDeviceIds[] =
+{
+ {"PNP0A05", "Generic Container Device"},
+ {"PNP0A06", "Generic Container Device"},
+ {"PNP0C08", "ACPI core hardware"},
+ {"PNP0C09", "Embedded Controller Device"},
+ {"PNP0C0A", "Control Method Battery"},
+ {"PNP0C0B", "Fan"},
+ {"PNP0C0C", "Power Button Device"},
+ {"PNP0C0D", "Lid Device"},
+ {"PNP0C0E", "Sleep Button Device"},
+ {"PNP0C0F", "PCI Interrupt Link Device"},
+ {"PNP0C80", "Memory Device"},
+
+ {"ACPI0001", "SMBus 1.0 Host Controller"},
+ {"ACPI0002", "Smart Battery Subsystem"},
+ {"ACPI0003", "Power Source Device"},
+ {"ACPI0004", "Module Device"},
+ {"ACPI0005", "SMBus 2.0 Host Controller"},
+ {"ACPI0006", "GPE Block Device"},
+ {"ACPI0007", "Processor Device"},
+ {"ACPI0008", "Ambient Light Sensor Device"},
+ {"ACPI0009", "I/O xAPIC Device"},
+ {"ACPI000A", "I/O APIC Device"},
+ {"ACPI000B", "I/O SAPIC Device"},
+ {"ACPI000C", "Processor Aggregator Device"},
+ {"ACPI000D", "Power Meter Device"},
+ {"ACPI000E", "Time/Alarm Device"},
+ {"ACPI000F", "User Presence Detection Device"},
+
+ {NULL, NULL}
+};
+
+#define AH_DISPLAY_EXCEPTION(Status, Name) \
+ printf ("%.4X: %s\n", Status, Name)
+
#define BUFFER_LENGTH 128
#define LINE_BUFFER_LENGTH 512
@@ -806,39 +845,6 @@ AhPrintOneField (
*
******************************************************************************/
-static const AH_DEVICE_ID AhDeviceIds[] =
-{
- {"PNP0A05", "Generic Container Device"},
- {"PNP0A06", "Generic Container Device"},
- {"PNP0C08", "ACPI core hardware"},
- {"PNP0C09", "Embedded Controller Device"},
- {"PNP0C0A", "Control Method Battery"},
- {"PNP0C0B", "Fan"},
- {"PNP0C0C", "Power Button Device"},
- {"PNP0C0D", "Lid Device"},
- {"PNP0C0E", "Sleep Button Device"},
- {"PNP0C0F", "PCI Interrupt Link Device"},
- {"PNP0C80", "Memory Device"},
-
- {"ACPI0001", "SMBus 1.0 Host Controller"},
- {"ACPI0002", "Smart Battery Subsystem"},
- {"ACPI0003", "Power Source Device"},
- {"ACPI0004", "Module Device"},
- {"ACPI0005", "SMBus 2.0 Host Controller"},
- {"ACPI0006", "GPE Block Device"},
- {"ACPI0007", "Processor Device"},
- {"ACPI0008", "Ambient Light Sensor Device"},
- {"ACPI0009", "I/O xAPIC Device"},
- {"ACPI000A", "I/O APIC Device"},
- {"ACPI000B", "I/O SAPIC Device"},
- {"ACPI000C", "Processor Aggregator Device"},
- {"ACPI000D", "Power Meter Device"},
- {"ACPI000E", "Time/Alarm Device"},
- {"ACPI000F", "User Presence Detection Device"},
-
- {NULL, NULL}
-};
-
void
AhDisplayDeviceIds (
void)
@@ -853,3 +859,79 @@ AhDisplayDeviceIds (
DeviceId++;
}
}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: AhDecodeException
+ *
+ * PARAMETERS: HexString - ACPI status string from command line, in
+ * hex. If null, display all exceptions.
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Decode and display an ACPI_STATUS exception code.
+ *
+ ******************************************************************************/
+
+void
+AhDecodeException (
+ char *HexString)
+{
+ const char *ExceptionName;
+ UINT32 Status;
+ UINT32 i;
+
+
+ /*
+ * A null input string means to decode and display all known
+ * exception codes.
+ */
+ if (!HexString)
+ {
+ printf ("All defined ACPI exception codes:\n\n");
+ AH_DISPLAY_EXCEPTION (0, "AE_OK");
+
+ /* Display codes in each block of exception types */
+
+ for (i = 1; (i & AE_CODE_MASK) <= AE_CODE_MAX; i += 0x1000)
+ {
+ Status = i;
+ do
+ {
+ ExceptionName = AcpiUtValidateException ((ACPI_STATUS) Status);
+ if (ExceptionName)
+ {
+ AH_DISPLAY_EXCEPTION (Status, ExceptionName);
+ }
+ Status++;
+
+ } while (ExceptionName);
+ }
+ return;
+ }
+
+ /* Decode a single user-supplied exception code */
+
+ Status = ACPI_STRTOUL (HexString, NULL, 16);
+ if (!Status)
+ {
+ printf ("%s: Invalid hexadecimal exception code\n", HexString);
+ return;
+ }
+
+ if (Status > ACPI_UINT16_MAX)
+ {
+ AH_DISPLAY_EXCEPTION (Status, "Invalid exception code (more than 16 bits)");
+ return;
+ }
+
+ ExceptionName = AcpiUtValidateException ((ACPI_STATUS) Status);
+ if (!ExceptionName)
+ {
+ AH_DISPLAY_EXCEPTION (Status, "Unknown exception code");
+ return;
+ }
+
+ AH_DISPLAY_EXCEPTION (Status, ExceptionName);
+}
diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c
index e45a0b6..8a6787e 100644
--- a/source/tools/acpihelp/ahmain.c
+++ b/source/tools/acpihelp/ahmain.c
@@ -66,12 +66,18 @@ AhDisplayUsage (
ACPI_USAGE_HEADER ("acpihelp <options> [NamePrefix | HexValue]");
ACPI_OPTION ("-h", "Display help");
- ACPI_OPTION ("-i", "Display known ACPI Device IDs (_HID)");
+
+ printf ("\nACPI Names and Symbols:\n");
ACPI_OPTION ("-k [NamePrefix]", "Find/Display ASL non-operator keyword(s)");
ACPI_OPTION ("-m [NamePrefix]", "Find/Display AML opcode name(s)");
- ACPI_OPTION ("-o [HexValue]", "Decode hex AML opcode");
ACPI_OPTION ("-p [NamePrefix]", "Find/Display ASL predefined method name(s)");
ACPI_OPTION ("-s [NamePrefix]", "Find/Display ASL operator name(s)");
+
+ printf ("\nACPI Values:\n");
+ ACPI_OPTION ("-e [HexValue]", "Decode ACPICA exception code");
+ ACPI_OPTION ("-i", "Display known ACPI Device IDs (_HID)");
+ ACPI_OPTION ("-o [HexValue]", "Decode hex AML opcode");
+
printf ("\nNamePrefix/HexValue not specified means \"Display All\"\n");
printf ("\nDefault search with NamePrefix and no options:\n");
printf (" Find ASL operator names - if NamePrefix does not start with underscore\n");
@@ -108,8 +114,12 @@ main (
/* Command line options */
- while ((j = AcpiGetopt (argc, argv, "hikmops")) != EOF) switch (j)
+ while ((j = AcpiGetopt (argc, argv, "ehikmops")) != EOF) switch (j)
{
+ case 'e':
+ DecodeType = AH_DECODE_EXCEPTION;
+ break;
+
case 'i':
DecodeType = AH_DISPLAY_DEVICE_IDS;
break;
@@ -170,6 +180,10 @@ main (
AhDisplayDeviceIds ();
break;
+ case AH_DECODE_EXCEPTION:
+ AhDecodeException (Name);
+ break;
+
default:
if (!Name)
{
diff --git a/source/tools/acpinames/Makefile b/source/tools/acpinames/Makefile
index bdd2d26..3a8c42d 100644
--- a/source/tools/acpinames/Makefile
+++ b/source/tools/acpinames/Makefile
@@ -114,6 +114,7 @@ OBJECTS = \
tbinstal.o \
tbutils.o \
tbxface.o \
+ tbxfload.o \
tbxfroot.o \
utaddress.o \
utalloc.o \
@@ -121,6 +122,7 @@ OBJECTS = \
utdebug.o \
utdecode.o \
utdelete.o \
+ utexcep.o \
utglobal.o \
utlock.o \
utmath.o \
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index 4e79cf3..d325738 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -716,7 +716,7 @@ AsGetFile (
/*
* Create a buffer for the entire file
- * Add plenty extra buffer to accomodate string replacements
+ * Add plenty extra buffer to accommodate string replacements
*/
Size = Gbl_StatBuf.st_size;
Gbl_TotalSize += Size;
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 400f562..b7defe7 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -178,6 +178,7 @@ ACPI_STRING_TABLE LinuxDataTypes[] = {
ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
+ {"ACPI_ADDRESS_RANGE", SRC_TYPE_STRUCT},
{"ACPI_ADR_SPACE_HANDLER", SRC_TYPE_SIMPLE},
{"ACPI_ADR_SPACE_SETUP", SRC_TYPE_SIMPLE},
{"ACPI_ADR_SPACE_TYPE", SRC_TYPE_SIMPLE},
OpenPOWER on IntegriCloud