summaryrefslogtreecommitdiff
path: root/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/acpiexec/aetables.c5
-rw-r--r--source/tools/acpihelp/acpihelp.h6
-rw-r--r--source/tools/acpihelp/ahaslkey.c58
-rw-r--r--source/tools/acpihelp/ahdecode.c32
-rw-r--r--source/tools/acpihelp/ahmain.c37
-rw-r--r--source/tools/acpinames/anstubs.c54
-rw-r--r--source/tools/acpisrc/acpisrc.h4
-rw-r--r--source/tools/acpisrc/asconvrt.c2
-rw-r--r--source/tools/acpisrc/asfile.c2
-rw-r--r--source/tools/acpisrc/asmain.c39
-rw-r--r--source/tools/acpisrc/astable.c5
-rw-r--r--source/tools/acpisrc/asutils.c34
-rw-r--r--source/tools/acpixtract/acpixtract.c33
13 files changed, 126 insertions, 185 deletions
diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c
index 14452db5eda84..ebb6aeb0e8d6e 100644
--- a/source/tools/acpiexec/aetables.c
+++ b/source/tools/acpiexec/aetables.c
@@ -329,6 +329,8 @@ AeBuildLocalTables (
* 2) A "hardware reduced" local FADT
* 3) A fully featured local FADT
*/
+ memset (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
+
if (ExternalFadt)
{
/*
@@ -361,7 +363,7 @@ AeBuildLocalTables (
}
else if (AcpiGbl_UseHwReducedFadt)
{
- memcpy (&LocalFADT, HwReducedFadtCode, sizeof (ACPI_TABLE_FADT));
+ memcpy (&LocalFADT, HwReducedFadtCode, ACPI_FADT_V5_SIZE);
LocalFADT.Dsdt = (UINT32) DsdtAddress;
LocalFADT.XDsdt = DsdtAddress;
@@ -374,7 +376,6 @@ AeBuildLocalTables (
/*
* Build a local FADT so we can test the hardware/event init
*/
- memset (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
LocalFADT.Header.Revision = 5;
AeInitializeTableHeader ((void *) &LocalFADT, ACPI_SIG_FADT, sizeof (ACPI_TABLE_FADT));
diff --git a/source/tools/acpihelp/acpihelp.h b/source/tools/acpihelp/acpihelp.h
index e1b061dde6119..251cd9de0b062 100644
--- a/source/tools/acpihelp/acpihelp.h
+++ b/source/tools/acpihelp/acpihelp.h
@@ -115,7 +115,7 @@ typedef struct ah_asl_keyword
typedef struct ah_directive_info
{
char *Name;
- char *Operands;
+ char *Description;
} AH_DIRECTIVE_INFO;
@@ -128,10 +128,6 @@ extern const AH_TABLE AcpiSupportedTables[];
extern BOOLEAN AhDisplayAll;
void
-AhStrupr (
- char *SrcString);
-
-void
AhFindAmlOpcode (
char *Name);
diff --git a/source/tools/acpihelp/ahaslkey.c b/source/tools/acpihelp/ahaslkey.c
index e15d47cd62c60..30318736332dd 100644
--- a/source/tools/acpihelp/ahaslkey.c
+++ b/source/tools/acpihelp/ahaslkey.c
@@ -153,26 +153,40 @@ const AH_ASL_KEYWORD AslKeywordInfo[] =
const AH_DIRECTIVE_INFO PreprocessorDirectives[] =
{
- {"#define", "OriginalName, DefinedName"},
- {"#elif", "Expression"},
- {"#else", ""},
- {"#endif", ""},
- {"#error", "Message"},
- {"#if", "Expression"},
- {"#ifdef", "DefinedName"},
- {"#ifndef", "DefinedName"},
- {"#include", "\"Filename\""},
- {"#include", "<Filename>"},
- {"#includebuffer", "\"Filename\""},
- {"#includebuffer", "<Filename>"},
- {"#line", ""},
- {"#pragma", "Disable error-number"},
- {"#pragma", "Message"},
- {"#undef", "DefinedName"},
- {"#warning", ""},
- {"__DATE__", "Returns current date"},
- {"__FILE__", "Returns name of current ASL file"},
- {"__LINE__", "Returns line number in ASL file"},
- {"__PATH__", "Returns full pathname of current ASL file"},
- {NULL, 0}
+ {"#include \"Filename\"", "Standard include of an ASCII ASL source code file"},
+ {"#include <Filename>", "Alternate syntax for #include, alternate search path"},
+ {"#includebuffer \"Filename\" <Name>", "Include a binary file to create AML Buffer with ASL namepath"},
+ {"#includebuffer <Filename> <Name>", "Alternate syntax for #includebuffer, alternate search path"},
+
+ {"", ""},
+ {"#define <Name>, <Defined name>", "Simple macro definition (full macros not supported at this time)"},
+ {"#define <Expression>, <Defined name>","Simple macro definition (full macros not supported at this time)"},
+ {"#undef <Defined name>", "Delete a previous #define"},
+
+ {"", ""},
+ {"#if <Expression>", "Evaluate <Expression> and test return value"},
+ {"#ifdef <Defined name>", "Test existence of the <Defined Name>"},
+ {"#ifndef <Defined name>", "Test non-existence of the <Defined Name>"},
+ {"#elif <Expression>", "Else-If contraction - evaluate #if <Expression>, test return value"},
+ {"#else", "Execute alternate case for a previous #if, #ifdef or #ifndef block"},
+ {"#endif", "Close a previous #if, #ifdef or #ifndef block"},
+
+ {"", ""},
+ {"#line <LineNumber> [Filename]", "Set the current ASL source code line number, optional filename"},
+
+ {"", ""},
+ {"#error \"String\"", "Emit error message and abort compilation"},
+ {"#warning \"String\"", "Emit an iASL warning at this location in the ASL source"},
+
+ {"", ""},
+ {"#pragma disable (Error number)", "Disable an iASL error or warning number"},
+ {"#pragma message \"String\"", "Emit an informational message to the output file(s)"},
+
+ {"", ""},
+ {"__FILE__", "Return the simple filename of the current ASL file"},
+ {"__PATH__", "Return the full pathname of the current ASL file"},
+ {"__LINE__", "Return the current line number within the current ASL file"},
+ {"__DATE__", "Return the current date"},
+ {"__IASL__", "Permanently defined for the iASL compiler"},
+ {NULL, NULL}
};
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index 95ea29ebf1c08..7e6d7c8b7427e 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -100,6 +100,18 @@ AhPrintOneField (
const char *Field);
+/*******************************************************************************
+ *
+ * FUNCTION: AhDisplayDirectives
+ *
+ * PARAMETERS: None
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Display all iASL preprocessor directives.
+ *
+ ******************************************************************************/
+
void
AhDisplayDirectives (
void)
@@ -107,11 +119,11 @@ AhDisplayDirectives (
const AH_DIRECTIVE_INFO *Info;
- printf ("iASL Preprocessor directives:\n\n");
+ printf ("iASL Preprocessor Directives\n\n");
for (Info = PreprocessorDirectives; Info->Name; Info++)
{
- printf ("%16s : %s\n", Info->Name, Info->Operands);
+ printf (" %-36s : %s\n", Info->Name, Info->Description);
}
}
@@ -148,7 +160,7 @@ AhFindPredefinedNames (
/* Contruct a local name or name prefix */
- AhStrupr (NamePrefix);
+ AcpiUtStrupr (NamePrefix);
if (*NamePrefix == '_')
{
NamePrefix++;
@@ -333,7 +345,7 @@ AhFindAmlOpcode (
BOOLEAN Found = FALSE;
- AhStrupr (Name);
+ AcpiUtStrupr (Name);
/* Find/display all opcode names that match the input name prefix */
@@ -354,7 +366,7 @@ AhFindAmlOpcode (
/* Upper case the opcode name before substring compare */
strcpy (Gbl_Buffer, Op->OpcodeName);
- AhStrupr (Gbl_Buffer);
+ AcpiUtStrupr (Gbl_Buffer);
if (strstr (Gbl_Buffer, Name) == Gbl_Buffer)
{
@@ -511,7 +523,7 @@ AhFindAslKeywords (
BOOLEAN Found = FALSE;
- AhStrupr (Name);
+ AcpiUtStrupr (Name);
for (Keyword = AslKeywordInfo; Keyword->Name; Keyword++)
{
@@ -525,7 +537,7 @@ AhFindAslKeywords (
/* Upper case the operator name before substring compare */
strcpy (Gbl_Buffer, Keyword->Name);
- AhStrupr (Gbl_Buffer);
+ AcpiUtStrupr (Gbl_Buffer);
if (strstr (Gbl_Buffer, Name) == Gbl_Buffer)
{
@@ -626,7 +638,7 @@ AhFindAslOperators (
BOOLEAN MatchCount = 0;
- AhStrupr (Name);
+ AcpiUtStrupr (Name);
/* Find/display all names that match the input name prefix */
@@ -642,7 +654,7 @@ AhFindAslOperators (
/* Upper case the operator name before substring compare */
strcpy (Gbl_Buffer, Operator->Name);
- AhStrupr (Gbl_Buffer);
+ AcpiUtStrupr (Gbl_Buffer);
if (strstr (Gbl_Buffer, Name) == Gbl_Buffer)
{
@@ -866,7 +878,7 @@ AhDisplayDeviceIds (
/* Find/display all names that match the input name prefix */
- AhStrupr (Name);
+ AcpiUtStrupr (Name);
for (Info = AslDeviceIds; Info->Name; Info++)
{
Matched = TRUE;
diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c
index 0416eec74e3ee..5ce37086d9f8e 100644
--- a/source/tools/acpihelp/ahmain.c
+++ b/source/tools/acpihelp/ahmain.c
@@ -278,40 +278,3 @@ main (
return (0);
}
-
-
-/*******************************************************************************
- *
- * FUNCTION: AhStrupr (strupr)
- *
- * PARAMETERS: SrcString - The source string to convert
- *
- * RETURN: None
- *
- * DESCRIPTION: Convert string to uppercase
- *
- * NOTE: This is not a POSIX function, so it appears here, not in utclib.c
- *
- ******************************************************************************/
-
-void
-AhStrupr (
- char *SrcString)
-{
- char *String;
-
-
- if (!SrcString)
- {
- return;
- }
-
- /* Walk entire string, uppercasing the letters */
-
- for (String = SrcString; *String; String++)
- {
- *String = (char) toupper ((int) *String);
- }
-
- return;
-}
diff --git a/source/tools/acpinames/anstubs.c b/source/tools/acpinames/anstubs.c
index 7d2fdcc0aebdd..f8b1d2d6ae822 100644
--- a/source/tools/acpinames/anstubs.c
+++ b/source/tools/acpinames/anstubs.c
@@ -164,6 +164,60 @@ AcpiNsExecModuleCodeList (
{
}
+void
+AcpiExDoDebugObject (
+ ACPI_OPERAND_OBJECT *SourceDesc,
+ UINT32 Level,
+ UINT32 Index)
+{
+ return;
+}
+
+void
+AcpiExStartTraceMethod (
+ ACPI_NAMESPACE_NODE *MethodNode,
+ ACPI_OPERAND_OBJECT *ObjDesc,
+ ACPI_WALK_STATE *WalkState)
+{
+ return;
+}
+
+void
+AcpiExStopTraceMethod (
+ ACPI_NAMESPACE_NODE *MethodNode,
+ ACPI_OPERAND_OBJECT *ObjDesc,
+ ACPI_WALK_STATE *WalkState)
+{
+ return;
+}
+
+void
+AcpiExStartTraceOpcode (
+ ACPI_PARSE_OBJECT *Op,
+ ACPI_WALK_STATE *WalkState)
+{
+ return;
+}
+
+void
+AcpiExStopTraceOpcode (
+ ACPI_PARSE_OBJECT *Op,
+ ACPI_WALK_STATE *WalkState)
+
+{
+ return;
+}
+
+void
+AcpiExTracePoint (
+ ACPI_TRACE_EVENT_TYPE Type,
+ BOOLEAN Begin,
+ UINT8 *Aml,
+ char *Pathname)
+{
+ return;
+}
+
/* Dispatcher */
diff --git a/source/tools/acpisrc/acpisrc.h b/source/tools/acpisrc/acpisrc.h
index d5dc9f81d31e5..17acac3a352d9 100644
--- a/source/tools/acpisrc/acpisrc.h
+++ b/source/tools/acpisrc/acpisrc.h
@@ -426,7 +426,3 @@ AsInsertCarriageReturns (
void
AsConvertToLineFeeds (
char *Buffer);
-
-void
-AsStrlwr (
- char *SrcString);
diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c
index 5b0f5f4615965..5a82167c13afc 100644
--- a/source/tools/acpisrc/asconvrt.c
+++ b/source/tools/acpisrc/asconvrt.c
@@ -1487,7 +1487,7 @@ AsInsertPrefix (
}
strcpy (LowerKeyword, Keyword);
- AsStrlwr (LowerKeyword);
+ AcpiUtStrlwr (LowerKeyword);
SubBuffer = Buffer;
SubString = Buffer;
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index 1e686cff1a71d..cd18430570854 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -180,7 +180,7 @@ AsProcessTree (
{
if (ConversionTable->Flags & FLG_LOWERCASE_DIRNAMES)
{
- AsStrlwr (TargetPath);
+ AcpiUtStrlwr (TargetPath);
}
VERBOSE_PRINT (("Creating Directory \"%s\"\n", TargetPath));
diff --git a/source/tools/acpisrc/asmain.c b/source/tools/acpisrc/asmain.c
index 95f8beed129d8..4da3cdd5c5a34 100644
--- a/source/tools/acpisrc/asmain.c
+++ b/source/tools/acpisrc/asmain.c
@@ -47,11 +47,6 @@
/* Local prototypes */
int
-AsStricmp (
- char *String1,
- char *String2);
-
-int
AsExaminePaths (
ACPI_CONVERSION_TABLE *ConversionTable,
char *Source,
@@ -104,38 +99,6 @@ BOOLEAN Gbl_IgnoreTranslationEscapes = FALSE;
/******************************************************************************
*
- * FUNCTION: AsStricmp
- *
- * DESCRIPTION: Implementation of the non-ANSI stricmp function (compare
- * strings with no case sensitivity)
- *
- ******************************************************************************/
-
-int
-AsStricmp (
- char *String1,
- char *String2)
-{
- int c1;
- int c2;
-
-
- do
- {
- c1 = tolower ((int) *String1);
- c2 = tolower ((int) *String2);
-
- String1++;
- String2++;
- }
- while ((c1 == c2) && (c1));
-
- return (c1 - c2);
-}
-
-
-/******************************************************************************
- *
* FUNCTION: AsExaminePaths
*
* DESCRIPTION: Source and Target pathname verification and handling
@@ -177,7 +140,7 @@ AsExaminePaths (
return (0);
}
- if (!AsStricmp (Source, Target))
+ if (!AcpiUtStricmp (Source, Target))
{
printf ("Target path is the same as the source path, overwrite?\n");
Response = getchar ();
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index a10681ef09153..6cc27131dda3d 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -264,6 +264,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_MEM_SPACE_CONTEXT", SRC_TYPE_STRUCT},
{"ACPI_MEMORY_ATTRIBUTE", SRC_TYPE_STRUCT},
{"ACPI_MEMORY_LIST", SRC_TYPE_STRUCT},
+ {"ACPI_METHOD_LOCAL", SRC_TYPE_STRUCT},
{"ACPI_MTMR_ENTRY", SRC_TYPE_STRUCT},
{"ACPI_MUTEX", SRC_TYPE_SIMPLE},
{"ACPI_MUTEX_HANDLE", SRC_TYPE_SIMPLE},
@@ -418,6 +419,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_TAG_INFO", SRC_TYPE_STRUCT},
{"ACPI_THREAD_ID", SRC_TYPE_SIMPLE},
{"ACPI_THREAD_STATE", SRC_TYPE_STRUCT},
+ {"ACPI_TRACE_EVENT_TYPE", SRC_TYPE_SIMPLE},
{"ACPI_TYPED_IDENTIFIER_TABLE", SRC_TYPE_STRUCT},
{"ACPI_UINTPTR_T", SRC_TYPE_SIMPLE},
{"ACPI_UPDATE_STATE", SRC_TYPE_STRUCT},
@@ -491,6 +493,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ASL_LISTING_NODE", SRC_TYPE_STRUCT},
{"ASL_MAPPING_ENTRY", SRC_TYPE_STRUCT},
{"ASL_METHOD_INFO", SRC_TYPE_STRUCT},
+ {"ASL_METHOD_LOCAL", SRC_TYPE_STRUCT},
{"ASL_RESERVED_INFO", SRC_TYPE_STRUCT},
{"ASL_RESOURCE_INFO", SRC_TYPE_STRUCT},
{"ASL_RESOURCE_NODE", SRC_TYPE_STRUCT},
@@ -667,6 +670,8 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_SRAT_MEM_AFFINITY", SRC_TYPE_STRUCT},
{"ACPI_SRAT_X2APIC_CPU_AFFINITY", SRC_TYPE_STRUCT},
{"ACPI_SRAT_GICC_AFFINITY", SRC_TYPE_STRUCT},
+ {"ACPI_TABLE_TCPA_CLIENT", SRC_TYPE_STRUCT},
+ {"ACPI_TABLE_TCPA_SERVER", SRC_TYPE_STRUCT},
{"ACPI_TPM2_CONTROL", SRC_TYPE_STRUCT},
{"ACPI_WDAT_ENTRY", SRC_TYPE_STRUCT},
diff --git a/source/tools/acpisrc/asutils.c b/source/tools/acpisrc/asutils.c
index 31103a09fbdad..7621fd6925053 100644
--- a/source/tools/acpisrc/asutils.c
+++ b/source/tools/acpisrc/asutils.c
@@ -44,40 +44,6 @@
#include "acpisrc.h"
-/*******************************************************************************
- *
- * FUNCTION: AsStrlwr (strlwr)
- *
- * PARAMETERS: SrcString - The source string to convert
- *
- * RETURN: None
- *
- * DESCRIPTION: Convert string to lowercase
- *
- * NOTE: This is not a POSIX function, so it appears here so that we don't have
- * header file issues with the various hosts/compilers/clibs.
- *
- ******************************************************************************/
-
-void
-AsStrlwr (
- char *SrcString)
-{
- char *String;
-
-
- /* Walk entire string, lowercasing the letters */
-
- if (SrcString)
- {
- for (String = SrcString; *String; String++)
- {
- *String = (char) tolower ((int) *String);
- }
- }
-}
-
-
/******************************************************************************
*
* FUNCTION: AsSkipUntilChar
diff --git a/source/tools/acpixtract/acpixtract.c b/source/tools/acpixtract/acpixtract.c
index d005919f82654..373c9cd95bc7e 100644
--- a/source/tools/acpixtract/acpixtract.c
+++ b/source/tools/acpixtract/acpixtract.c
@@ -53,10 +53,6 @@
/* Local prototypes */
static void
-AxStrlwr (
- char *String);
-
-static void
AxCheckAscii (
char *Name,
int Count);
@@ -129,31 +125,6 @@ static char InstanceBuffer[AX_LINE_BUFFER_SIZE];
/*******************************************************************************
*
- * FUNCTION: AxStrlwr
- *
- * PARAMETERS: String - Ascii string
- *
- * RETURN: None
- *
- * DESCRIPTION: String lowercase function.
- *
- ******************************************************************************/
-
-static void
-AxStrlwr (
- char *String)
-{
-
- while (*String)
- {
- *String = (char) tolower ((int) *String);
- String++;
- }
-}
-
-
-/*******************************************************************************
- *
* FUNCTION: AxCheckAscii
*
* PARAMETERS: Name - Ascii string, at least as long as Count
@@ -594,7 +565,7 @@ AxExtractTables (
sprintf (Filename, "%4.4s.dat", ThisSignature);
}
- AxStrlwr (Filename);
+ AcpiUtStrlwr (Filename);
OutputFile = fopen (Filename, "w+b");
if (!OutputFile)
{
@@ -695,7 +666,7 @@ AxListTables (
FILE *InputFile;
size_t HeaderSize;
unsigned char Header[48];
- int TableCount = 0;
+ unsigned int TableCount = 0;
ACPI_TABLE_HEADER *TableHeader = (ACPI_TABLE_HEADER *) (void *) Header;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 01:07:12 +0000