summaryrefslogtreecommitdiff
path: root/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/acpibin/abcompare.c2
-rw-r--r--source/tools/acpidump/apdump.c9
-rw-r--r--source/tools/acpihelp/ahamlops.c16
-rw-r--r--source/tools/acpihelp/ahaslops.c22
-rw-r--r--source/tools/acpisrc/astable.c2
-rw-r--r--source/tools/acpixtract/acpixtract.c6
-rw-r--r--source/tools/acpixtract/acpixtract.h4
-rw-r--r--source/tools/acpixtract/axutils.c75
8 files changed, 33 insertions, 103 deletions
diff --git a/source/tools/acpibin/abcompare.c b/source/tools/acpibin/abcompare.c
index 93520a6e21540..452d2036e37a5 100644
--- a/source/tools/acpibin/abcompare.c
+++ b/source/tools/acpibin/abcompare.c
@@ -91,7 +91,7 @@ AbValidateHeader (
ACPI_TABLE_HEADER *Header)
{
- if (!AcpiUtValidAcpiName (Header->Signature))
+ if (!AcpiUtValidNameseg (Header->Signature))
{
printf ("Header signature is invalid\n");
return (FALSE);
diff --git a/source/tools/acpidump/apdump.c b/source/tools/acpidump/apdump.c
index ac3e9ea384772..58e430c5a41ca 100644
--- a/source/tools/acpidump/apdump.c
+++ b/source/tools/acpidump/apdump.c
@@ -74,7 +74,7 @@ ApIsValidHeader (
{
/* Make sure signature is all ASCII and a valid ACPI name */
- if (!AcpiUtValidAcpiName (Table->Signature))
+ if (!AcpiUtValidNameseg (Table->Signature))
{
AcpiLogError ("Table signature (0x%8.8X) is invalid\n",
*(UINT32 *) Table->Signature);
@@ -465,6 +465,13 @@ ApDumpTableFromFile (
return (-1);
}
+ if (!AcpiUtValidNameseg (Table->Signature))
+ {
+ AcpiLogError (
+ "No valid ACPI signature was found in input file %s\n",
+ Pathname);
+ }
+
/* File must be at least as long as the table length */
if (Table->Length > FileSize)
diff --git a/source/tools/acpihelp/ahamlops.c b/source/tools/acpihelp/ahamlops.c
index 70863e4ebd923..8ca28728c572a 100644
--- a/source/tools/acpihelp/ahamlops.c
+++ b/source/tools/acpihelp/ahamlops.c
@@ -147,14 +147,14 @@ const AH_AML_OPCODE AmlOpcodeInfo[] =
"DefOpRegion := OpRegionOp NameString RegionSpace RegionOffset RegionLen"},
{0x5B81, 0x5B81, "0x5B81", "FieldOp", "TermObject", "NameString ByteData", "FieldList",
"DefField := FieldOp PkgLength NameString FieldFlags FieldList"},
- {0x5B82, 0x5B82, "0x5B82", "DeviceOp", "TermObject", "NameString", "ObjectList",
- "DefDevice := DeviceOp PkgLength NameString ObjectList"},
- {0x5B83, 0x5B83, "0x5B83", "ProcessorOp", "TermObject", "NameString ByteData DWordData ByteData", "ObjectList",
- "DefProcessor := ProcessorOp PkgLength NameString ProcId PblkAddr PblkLen ObjectList"},
- {0x5B84, 0x5B84, "0x5B84", "PowerResOp", "TermObject", "NameString ByteData WordData", "ObjectList",
- "DefPowerRes := PowerResOp PkgLength NameString SystemLevel ResourceOrder ObjectList"},
- {0x5B85, 0x5B85, "0x5B85", "ThermalZoneOp", "TermObject", "NameString", "ObjectList",
- "DefThermalZone := ThermalZoneOp PkgLength NameString ObjectList"},
+ {0x5B82, 0x5B82, "0x5B82", "DeviceOp", "TermObject", "NameString", "TermList",
+ "DefDevice := DeviceOp PkgLength NameString TermList"},
+ {0x5B83, 0x5B83, "0x5B83", "ProcessorOp", "TermObject", "NameString ByteData DWordData ByteData", "TermList",
+ "DefProcessor := ProcessorOp PkgLength NameString ProcId PblkAddr PblkLen TermList"},
+ {0x5B84, 0x5B84, "0x5B84", "PowerResOp", "TermObject", "NameString ByteData WordData", "TermList",
+ "DefPowerRes := PowerResOp PkgLength NameString SystemLevel ResourceOrder TermList"},
+ {0x5B85, 0x5B85, "0x5B85", "ThermalZoneOp", "TermObject", "NameString", "TermList",
+ "DefThermalZone := ThermalZoneOp PkgLength NameString TermList"},
{0x5B86, 0x5B86, "0x5B86", "IndexFieldOp", "TermObject", "NameString NameString ByteData", "FieldList",
"DefIndexField := IndexFieldOp PkgLength NameString NameString FieldFlags FieldList"},
{0x5B87, 0x5B87, "0x5B87", "BankFieldOp", "TermObject", "NameString NameString TermArg ByteData", "FieldList",
diff --git a/source/tools/acpihelp/ahaslops.c b/source/tools/acpihelp/ahaslops.c
index 9fcca7d1ca28b..39abc31b44f50 100644
--- a/source/tools/acpihelp/ahaslops.c
+++ b/source/tools/acpihelp/ahaslops.c
@@ -112,7 +112,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Declare a Definition Block"},
{"DerefOf", "(Source) => Object",
"Dereference an object reference"},
- {"Device", "(DeviceName) {ObjectList}",
+ {"Device", "(DeviceName) {TermList}",
"Declare a bus/device object"},
{"Divide", "(Dividend, Divisor, Remainder, Result) => Integer",
"Integer Divide"},
@@ -193,9 +193,9 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, "
"RawDataBuffer() {VendorData}) {PinList}",
"GPIO I/O Connection Resource Descriptor Macro"},
- {"I2cSerialBus", "(SlaveAddress, SlaveModeKeyword, ConnectionSpeed, "
+ {"I2cSerialBusV2", "(SlaveAddress, SlaveModeKeyword, ConnectionSpeed, "
"AddressingModeKeyword, ResourceSource, "
- "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, "
+ "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, Shared, "
"RawDataBuffer() {VendorData})",
"I2C Serial Bus Connection Resource Descriptor Macro"},
{"If", "(Predicate) {TermList}",
@@ -295,9 +295,9 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Integer Bitwise Or"},
{"Package", "(NumElements) {PackageList} => Package",
"Declare a package object"},
- {"PowerResource", "(ResourceName, SystemLevel, ResourceOrder) {ObjectList}",
+ {"PowerResource", "(ResourceName, SystemLevel, ResourceOrder) {TermList}",
"Declare a power resource object"},
- {"Processor", "(ProcessorName, ProcessorID, PBlockAddress, PblockLength) {ObjectList}",
+ {"Processor", "(ProcessorName, ProcessorID, PBlockAddress, PblockLength) {TermList}",
"Declare a processor package"},
{"QWordIo", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, "
"RangeTypeKeyword, AddressGranularity, "
@@ -335,7 +335,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Return from method execution"},
{"Revision", "=> Integer",
"Constant revision object"},
- {"Scope", "(Location) {ObjectList}",
+ {"Scope", "(Location) {TermList}",
"Open named scope "},
{"ShiftLeft", "(Source, ShiftCount, Result) => Integer",
"Integer shift value left"},
@@ -347,11 +347,11 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Get the size of a buffer}, string}, or package"},
{"Sleep", "(Milliseconds)",
"Sleep n milliseconds (yields the processor)"},
- {"SpiSerialBus", "(DeviceSelection, PolarityKeyword, WireModeKeyword, "
+ {"SpiSerialBusV2", "(DeviceSelection, PolarityKeyword, WireModeKeyword, "
"DataBitLength, SlaveModeKeyword, "
"ConnectionSpeed, ClockPolarityKeyword, ClockPhaseKeyword, "
"ResourceSource, ResourceSourceIndex, "
- "ResourceTypeKeyword, DescriptorName, RawDataBuffer() {VendorData})",
+ "ResourceTypeKeyword, DescriptorName, Shared, RawDataBuffer() {VendorData})",
"SPI Serial Bus Connection Resource Descriptor Macro"},
{"Stall", "(Microseconds)",
"Delay n microseconds (does not yield the processor)"},
@@ -365,7 +365,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Integer Subtract"},
{"Switch", "(Expression) {CaseTermList}",
"Select code to execute based on expression value"},
- {"ThermalZone", "(ThermalZoneName) {ObjectList}",
+ {"ThermalZone", "(ThermalZoneName) {TermList}",
"Declare a thermal zone package"},
{"Timer", "=> Integer",
"Get 64-bit timer value"},
@@ -383,10 +383,10 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Copy ASCII string from buffer"},
{"ToUuid", "(AsciiString) => Buffer",
"Convert Ascii string to UUID"},
- {"UartSerialBus", "(ConnectionSpeed, ByteLengthKeyword, StopBitsKeyword, "
+ {"UartSerialBusV2", "(ConnectionSpeed, ByteLengthKeyword, StopBitsKeyword, "
"LinesInUse, EndianKeyword, ParityKeyword, "
"FlowControlKeyword, ReceiveBufferSize, TransmitBufferSize, ResourceSource, "
- "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, "
+ "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, Shared, "
"RawDataBuffer() {VendorData})",
"UART Serial Bus Connection Resource Descriptor Macro"},
{"Unicode", "(String) => Buffer",
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 9671834c14d43..63e78f92e522a 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -624,6 +624,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_IORT_NODE", SRC_TYPE_STRUCT},
{"ACPI_IORT_ROOT_COMPLEX", SRC_TYPE_STRUCT},
{"ACPI_IORT_SMMU", SRC_TYPE_STRUCT},
+ {"ACPI_IORT_SMMU_V3", SRC_TYPE_STRUCT},
{"ACPI_IVRS_HEADER", SRC_TYPE_STRUCT},
{"ACPI_IVRS_HARDWARE", SRC_TYPE_STRUCT},
{"ACPI_IVRS_DE_HEADER", SRC_TYPE_STRUCT},
@@ -666,6 +667,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_NFIT_DATA_REGION", SRC_TYPE_STRUCT},
{"ACPI_NFIT_FLUSH_ADDRESS", SRC_TYPE_STRUCT},
{"ACPI_PCCT_HW_REDUCED", SRC_TYPE_STRUCT},
+ {"ACPI_PCCT_HW_REDUCED_TYPE2", SRC_TYPE_STRUCT},
{"ACPI_PCCT_SHARED_MEMORY", SRC_TYPE_STRUCT},
{"ACPI_PCCT_SUBSPACE", SRC_TYPE_STRUCT},
{"ACPI_RSDP_COMMON", SRC_TYPE_STRUCT},
diff --git a/source/tools/acpixtract/acpixtract.c b/source/tools/acpixtract/acpixtract.c
index e0d17556f709c..1573ceeff065f 100644
--- a/source/tools/acpixtract/acpixtract.c
+++ b/source/tools/acpixtract/acpixtract.c
@@ -239,7 +239,7 @@ CleanupAndExit:
if (Gbl_TableCount > 1)
{
- printf ("\n%d binary ACPI tables extracted\n",
+ printf ("\n%u binary ACPI tables extracted\n",
Gbl_TableCount);
}
@@ -383,7 +383,7 @@ CleanupAndExit:
ThisSignature, ThisTableBytesWritten, Gbl_OutputFilename);
}
- printf ("\n%d binary ACPI tables extracted and written to %s (%u bytes)\n",
+ printf ("\n%u binary ACPI tables extracted and written to %s (%u bytes)\n",
Gbl_TableCount, Gbl_OutputFilename, TotalBytesWritten);
fclose (InputFile);
@@ -471,7 +471,7 @@ AxListTables (
continue;
}
- if (!AcpiIsValidSignature (TableHeader->Signature))
+ if (!AcpiUtValidNameseg (TableHeader->Signature))
{
continue;
}
diff --git a/source/tools/acpixtract/acpixtract.h b/source/tools/acpixtract/acpixtract.h
index c280102cae69a..14df786a41862 100644
--- a/source/tools/acpixtract/acpixtract.h
+++ b/source/tools/acpixtract/acpixtract.h
@@ -148,10 +148,6 @@ void
AxNormalizeSignature (
char *Signature);
-BOOLEAN
-AcpiIsValidSignature (
- char *Signature);
-
void
AxCheckAscii (
char *Name,
diff --git a/source/tools/acpixtract/axutils.c b/source/tools/acpixtract/axutils.c
index 6d1d0d88346ce..6af8cdc29a3c9 100644
--- a/source/tools/acpixtract/axutils.c
+++ b/source/tools/acpixtract/axutils.c
@@ -46,81 +46,6 @@
/*******************************************************************************
*
- * FUNCTION: AcpiIsValidSignature
- *
- * PARAMETERS: Signature - Sig string to be validated
- *
- * RETURN: TRUE if signature is has 4 valid ACPI characters
- *
- * DESCRIPTION: Validate an ACPI table signature.
- *
- ******************************************************************************/
-
-BOOLEAN
-AcpiIsValidSignature (
- char *Signature)
-{
- UINT32 i;
-
-
- /* Validate each character in the signature */
-
- for (i = 0; i < ACPI_NAME_SIZE; i++)
- {
- if (!AcpiUtValidAcpiChar (Signature[i], i))
- {
- return (FALSE);
- }
- }
-
- return (TRUE);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION: AcpiUtValidAcpiChar
- *
- * PARAMETERS: Char - The character to be examined
- * Position - Byte position (0-3)
- *
- * RETURN: TRUE if the character is valid, FALSE otherwise
- *
- * DESCRIPTION: Check for a valid ACPI character. Must be one of:
- * 1) Upper case alpha
- * 2) numeric
- * 3) underscore
- *
- * We allow a '!' as the last character because of the ASF! table
- *
- ******************************************************************************/
-
-BOOLEAN
-AcpiUtValidAcpiChar (
- char Character,
- UINT32 Position)
-{
-
- if (!((Character >= 'A' && Character <= 'Z') ||
- (Character >= '0' && Character <= '9') ||
- (Character == '_')))
- {
- /* Allow a '!' in the last position */
-
- if (Character == '!' && Position == 3)
- {
- return (TRUE);
- }
-
- return (FALSE);
- }
-
- return (TRUE);
-}
-
-
-/*******************************************************************************
- *
* FUNCTION: AxCheckAscii
*
* PARAMETERS: Name - Ascii string, at least as long as Count
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 17:05:47 +0000