summaryrefslogtreecommitdiff
path: root/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/acpidump/acpidump.h2
-rw-r--r--source/tools/acpidump/apdump.c8
-rw-r--r--source/tools/acpidump/apfiles.c12
-rw-r--r--source/tools/acpidump/apmain.c19
-rw-r--r--source/tools/acpiexec/aeexec.c2
-rw-r--r--source/tools/acpiexec/aehandlers.c2
-rw-r--r--source/tools/acpiexec/aeinitfile.c20
-rw-r--r--source/tools/acpiexec/aeregion.c10
-rw-r--r--source/tools/acpiexec/aetables.c22
-rw-r--r--source/tools/acpihelp/ahamlops.c4
-rw-r--r--source/tools/acpihelp/ahdecode.c4
-rw-r--r--source/tools/acpinames/antables.c10
-rw-r--r--source/tools/acpisrc/acpisrc.h5
-rw-r--r--source/tools/acpisrc/asconvrt.c4
-rw-r--r--source/tools/acpisrc/asfile.c6
-rw-r--r--source/tools/acpisrc/asremove.c8
-rw-r--r--source/tools/acpisrc/astable.c10
-rw-r--r--source/tools/acpisrc/asutils.c2
18 files changed, 81 insertions, 69 deletions
diff --git a/source/tools/acpidump/acpidump.h b/source/tools/acpidump/acpidump.h
index c40373459cc8..3dfce10cb9c3 100644
--- a/source/tools/acpidump/acpidump.h
+++ b/source/tools/acpidump/acpidump.h
@@ -67,7 +67,7 @@
EXTERN BOOLEAN INIT_GLOBAL (Gbl_SummaryMode, FALSE);
EXTERN BOOLEAN INIT_GLOBAL (Gbl_VerboseMode, FALSE);
EXTERN BOOLEAN INIT_GLOBAL (Gbl_BinaryMode, FALSE);
-EXTERN BOOLEAN INIT_GLOBAL (Gbl_DumpCustomizedTables, FALSE);
+EXTERN BOOLEAN INIT_GLOBAL (Gbl_DumpCustomizedTables, TRUE);
EXTERN BOOLEAN INIT_GLOBAL (Gbl_DoNotDumpXsdt, FALSE);
EXTERN ACPI_FILE INIT_GLOBAL (Gbl_OutputFile, NULL);
EXTERN char INIT_GLOBAL (*Gbl_OutputFilename, NULL);
diff --git a/source/tools/acpidump/apdump.c b/source/tools/acpidump/apdump.c
index da4c599ee691..5355de2c5b50 100644
--- a/source/tools/acpidump/apdump.c
+++ b/source/tools/acpidump/apdump.c
@@ -375,7 +375,7 @@ ApDumpTableByName (
int TableStatus;
- if (ACPI_STRLEN (Signature) != ACPI_NAME_SIZE)
+ if (strlen (Signature) != ACPI_NAME_SIZE)
{
AcpiLogError (
"Invalid table signature [%s]: must be exactly 4 characters\n",
@@ -385,18 +385,18 @@ ApDumpTableByName (
/* Table signatures are expected to be uppercase */
- ACPI_STRCPY (LocalSignature, Signature);
+ strcpy (LocalSignature, Signature);
AcpiUtStrupr (LocalSignature);
/* To be friendly, handle tables whose signatures do not match the name */
if (ACPI_COMPARE_NAME (LocalSignature, "FADT"))
{
- ACPI_STRCPY (LocalSignature, ACPI_SIG_FADT);
+ strcpy (LocalSignature, ACPI_SIG_FADT);
}
else if (ACPI_COMPARE_NAME (LocalSignature, "MADT"))
{
- ACPI_STRCPY (LocalSignature, ACPI_SIG_MADT);
+ strcpy (LocalSignature, ACPI_SIG_MADT);
}
/* Dump all instances of this signature (to handle multiple SSDTs) */
diff --git a/source/tools/acpidump/apfiles.c b/source/tools/acpidump/apfiles.c
index 1e51ed65bebf..9c187271371b 100644
--- a/source/tools/acpidump/apfiles.c
+++ b/source/tools/acpidump/apfiles.c
@@ -159,10 +159,10 @@ ApWriteToBinaryFile (
{
ACPI_MOVE_NAME (Filename, Table->Signature);
}
- Filename[0] = (char) ACPI_TOLOWER (Filename[0]);
- Filename[1] = (char) ACPI_TOLOWER (Filename[1]);
- Filename[2] = (char) ACPI_TOLOWER (Filename[2]);
- Filename[3] = (char) ACPI_TOLOWER (Filename[3]);
+ Filename[0] = (char) tolower (Filename[0]);
+ Filename[1] = (char) tolower (Filename[1]);
+ Filename[2] = (char) tolower (Filename[2]);
+ Filename[3] = (char) tolower (Filename[3]);
Filename[ACPI_NAME_SIZE] = 0;
/* Handle multiple SSDTs - create different filenames for each */
@@ -170,10 +170,10 @@ ApWriteToBinaryFile (
if (Instance > 0)
{
AcpiUtSnprintf (InstanceStr, sizeof (InstanceStr), "%u", Instance);
- ACPI_STRCAT (Filename, InstanceStr);
+ strcat (Filename, InstanceStr);
}
- ACPI_STRCAT (Filename, ACPI_TABLE_FILE_SUFFIX);
+ strcat (Filename, ACPI_TABLE_FILE_SUFFIX);
if (Gbl_VerboseMode)
{
diff --git a/source/tools/acpidump/apmain.c b/source/tools/acpidump/apmain.c
index 682a0d537c7f..efc7a6d0b26a 100644
--- a/source/tools/acpidump/apmain.c
+++ b/source/tools/acpidump/apmain.c
@@ -92,7 +92,7 @@ UINT32 CurrentAction = 0;
#define AP_UTILITY_NAME "ACPI Binary Table Dump Utility"
-#define AP_SUPPORTED_OPTIONS "?a:bcf:hn:o:r:svxz"
+#define AP_SUPPORTED_OPTIONS "?a:bc:f:hn:o:r:svxz"
/******************************************************************************
@@ -111,7 +111,6 @@ ApDisplayUsage (
ACPI_USAGE_HEADER ("acpidump [options]");
ACPI_OPTION ("-b", "Dump tables to binary files");
- ACPI_OPTION ("-c", "Dump customized tables");
ACPI_OPTION ("-h -?", "This help message");
ACPI_OPTION ("-o <File>", "Redirect output to file");
ACPI_OPTION ("-r <Address>", "Dump tables from specified RSDP");
@@ -122,6 +121,7 @@ ApDisplayUsage (
ACPI_USAGE_TEXT ("\nTable Options:\n");
ACPI_OPTION ("-a <Address>", "Get table via a physical address");
+ ACPI_OPTION ("-c <on|off>", "Turning on/off customized table dumping");
ACPI_OPTION ("-f <BinaryFile>", "Get table via a binary file");
ACPI_OPTION ("-n <Signature>", "Get table via a name/signature");
ACPI_OPTION ("-x", "Do not use but dump XSDT");
@@ -205,7 +205,20 @@ ApDoOptions (
case 'c': /* Dump customized tables */
- Gbl_DumpCustomizedTables = TRUE;
+ if (!strcmp (AcpiGbl_Optarg, "on"))
+ {
+ Gbl_DumpCustomizedTables = TRUE;
+ }
+ else if (!strcmp (AcpiGbl_Optarg, "off"))
+ {
+ Gbl_DumpCustomizedTables = FALSE;
+ }
+ else
+ {
+ AcpiLogError ("%s: Cannot handle this switch, please use on|off\n",
+ AcpiGbl_Optarg);
+ return (-1);
+ }
continue;
case 'h':
diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c
index 7bfbcfaf073e..28ac7afb25f5 100644
--- a/source/tools/acpiexec/aeexec.c
+++ b/source/tools/acpiexec/aeexec.c
@@ -164,7 +164,7 @@ AfInstallGpeBlock (
return;
}
- ACPI_MEMSET (&BlockAddress, 0, sizeof (ACPI_GENERIC_ADDRESS));
+ memset (&BlockAddress, 0, sizeof (ACPI_GENERIC_ADDRESS));
BlockAddress.SpaceId = ACPI_ADR_SPACE_SYSTEM_MEMORY;
BlockAddress.Address = 0x76540000;
diff --git a/source/tools/acpiexec/aehandlers.c b/source/tools/acpiexec/aehandlers.c
index 17ef9dd084eb..895a27fca7f2 100644
--- a/source/tools/acpiexec/aehandlers.c
+++ b/source/tools/acpiexec/aehandlers.c
@@ -378,7 +378,7 @@ AeExceptionHandler (
Arg[1].Type = ACPI_TYPE_STRING;
Arg[1].String.Pointer = ACPI_CAST_PTR (char, Exception);
- Arg[1].String.Length = ACPI_STRLEN (Exception);
+ Arg[1].String.Length = strlen (Exception);
Arg[2].Type = ACPI_TYPE_INTEGER;
Arg[2].Integer.Value = AcpiOsGetThreadId();
diff --git a/source/tools/acpiexec/aeinitfile.c b/source/tools/acpiexec/aeinitfile.c
index 36463c5e3fbe..d20211b330c4 100644
--- a/source/tools/acpiexec/aeinitfile.c
+++ b/source/tools/acpiexec/aeinitfile.c
@@ -58,8 +58,9 @@ AeDoOneOverride (
ACPI_WALK_STATE *WalkState);
-#define AE_FILE_BUFFER_SIZE 512
+#define AE_FILE_BUFFER_SIZE 512
+static char LineBuffer[AE_FILE_BUFFER_SIZE];
static char NameBuffer[AE_FILE_BUFFER_SIZE];
static char ValueBuffer[AE_FILE_BUFFER_SIZE];
static FILE *InitFile;
@@ -127,15 +128,18 @@ AeDoObjectOverrides (
ObjDesc = AcpiUtCreateIntegerObject (0);
WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
-
NameBuffer[0] = '\\';
- /* Read the entire file line-by-line */
+ /* Read the entire file line-by-line */
- while (fscanf (InitFile, "%s %s\n",
- ACPI_CAST_PTR (char, &NameBuffer[1]),
- ACPI_CAST_PTR (char, &ValueBuffer)) == 2)
+ while (fgets (LineBuffer, AE_FILE_BUFFER_SIZE, InitFile) != NULL)
{
+ if (sscanf (LineBuffer, "%s %s\n",
+ &NameBuffer[1], ValueBuffer) != 2)
+ {
+ goto CleanupAndExit;
+ }
+
/* Add a root prefix if not present in the string */
i = 0;
@@ -149,6 +153,7 @@ AeDoObjectOverrides (
/* Cleanup */
+CleanupAndExit:
fclose (InitFile);
AcpiDsDeleteWalkState (WalkState);
AcpiUtRemoveReference (ObjDesc);
@@ -200,7 +205,8 @@ AeDoOneOverride (
Status = AcpiUtStrtoul64 (ValueString, 0, &Value);
if (ACPI_FAILURE (Status))
{
- AcpiOsPrintf ("%s\n", AcpiFormatException (Status));
+ AcpiOsPrintf ("%s %s\n", ValueString,
+ AcpiFormatException (Status));
return;
}
diff --git a/source/tools/acpiexec/aeregion.c b/source/tools/acpiexec/aeregion.c
index e1a450c3673c..311b6ae61756 100644
--- a/source/tools/acpiexec/aeregion.c
+++ b/source/tools/acpiexec/aeregion.c
@@ -732,7 +732,7 @@ AeRegionHandler (
/* Initialize the region with the default fill value */
- ACPI_MEMSET (RegionElement->Buffer,
+ memset (RegionElement->Buffer,
AcpiGbl_RegionFillValue, RegionElement->Length);
/*
@@ -747,7 +747,7 @@ AeRegionHandler (
* Copy the old buffer to its same location within the new
* buffer
*/
- ACPI_MEMCPY (BufferValue, OldBuffer, RegionLength);
+ memcpy (BufferValue, OldBuffer, RegionLength);
AcpiOsFree (OldBuffer);
}
}
@@ -776,7 +776,7 @@ AeRegionHandler (
/* Initialize the region with the default fill value */
- ACPI_MEMSET (RegionElement->Buffer, AcpiGbl_RegionFillValue, Length);
+ memset (RegionElement->Buffer, AcpiGbl_RegionFillValue, Length);
RegionElement->Address = BaseAddress;
RegionElement->Length = Length;
@@ -843,14 +843,14 @@ DoFunction:
/*
* Set the pointer Value to whatever is in the buffer
*/
- ACPI_MEMCPY (Value, BufferValue, ByteWidth);
+ memcpy (Value, BufferValue, ByteWidth);
break;
case ACPI_WRITE:
/*
* Write the contents of Value to the buffer
*/
- ACPI_MEMCPY (BufferValue, Value, ByteWidth);
+ memcpy (BufferValue, Value, ByteWidth);
break;
default:
diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c
index 88726a23920a..14452db5eda8 100644
--- a/source/tools/acpiexec/aetables.c
+++ b/source/tools/acpiexec/aetables.c
@@ -152,9 +152,9 @@ AeInitializeTableHeader (
Header->Length = Length;
Header->OemRevision = 0x1001;
- ACPI_STRNCPY (Header->OemId, "Intel", ACPI_OEM_ID_SIZE);
- ACPI_STRNCPY (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
- ACPI_STRNCPY (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE);
+ strncpy (Header->OemId, "Intel", ACPI_OEM_ID_SIZE);
+ strncpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
+ strncpy (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE);
Header->AslCompilerRevision = 0x20131218;
}
@@ -215,7 +215,7 @@ AeBuildLocalTables (
return (AE_NO_MEMORY);
}
- ACPI_MEMSET (LocalXSDT, 0, XsdtSize);
+ memset (LocalXSDT, 0, XsdtSize);
AeInitializeTableHeader ((void *) LocalXSDT, ACPI_SIG_XSDT, XsdtSize);
LocalXSDT->TableOffsetEntry[0] = ACPI_PTR_TO_PHYSADDR (&LocalFADT);
@@ -297,9 +297,9 @@ AeBuildLocalTables (
/* Build an RSDP. Contains a valid XSDT only, no RSDT */
- ACPI_MEMSET (&LocalRSDP, 0, sizeof (ACPI_TABLE_RSDP));
+ memset (&LocalRSDP, 0, sizeof (ACPI_TABLE_RSDP));
ACPI_MAKE_RSDP_SIG (LocalRSDP.Signature);
- ACPI_MEMCPY (LocalRSDP.OemId, "Intel", 6);
+ memcpy (LocalRSDP.OemId, "Intel", 6);
LocalRSDP.Revision = 2;
LocalRSDP.XsdtPhysicalAddress = ACPI_PTR_TO_PHYSADDR (LocalXSDT);
@@ -361,7 +361,7 @@ AeBuildLocalTables (
}
else if (AcpiGbl_UseHwReducedFadt)
{
- ACPI_MEMCPY (&LocalFADT, HwReducedFadtCode, sizeof (ACPI_TABLE_FADT));
+ memcpy (&LocalFADT, HwReducedFadtCode, sizeof (ACPI_TABLE_FADT));
LocalFADT.Dsdt = (UINT32) DsdtAddress;
LocalFADT.XDsdt = DsdtAddress;
@@ -374,7 +374,7 @@ AeBuildLocalTables (
/*
* Build a local FADT so we can test the hardware/event init
*/
- ACPI_MEMSET (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
+ memset (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
LocalFADT.Header.Revision = 5;
AeInitializeTableHeader ((void *) &LocalFADT, ACPI_SIG_FADT, sizeof (ACPI_TABLE_FADT));
@@ -423,7 +423,7 @@ AeBuildLocalTables (
/* Build a FACS */
- ACPI_MEMSET (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
+ memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS);
LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
@@ -437,7 +437,7 @@ AeBuildLocalTables (
* Build a fake table [TEST] so that we make sure that the
* ACPICA core ignores it
*/
- ACPI_MEMSET (&LocalTEST, 0, sizeof (ACPI_TABLE_HEADER));
+ memset (&LocalTEST, 0, sizeof (ACPI_TABLE_HEADER));
ACPI_MOVE_NAME (LocalTEST.Signature, "TEST");
LocalTEST.Revision = 1;
@@ -449,7 +449,7 @@ AeBuildLocalTables (
* Build a fake table with a bad signature [BAD!] so that we make
* sure that the ACPICA core ignores it
*/
- ACPI_MEMSET (&LocalBADTABLE, 0, sizeof (ACPI_TABLE_HEADER));
+ memset (&LocalBADTABLE, 0, sizeof (ACPI_TABLE_HEADER));
ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!");
LocalBADTABLE.Revision = 1;
diff --git a/source/tools/acpihelp/ahamlops.c b/source/tools/acpihelp/ahamlops.c
index 8d54887f7275..1fc4c3320657 100644
--- a/source/tools/acpihelp/ahamlops.c
+++ b/source/tools/acpihelp/ahamlops.c
@@ -85,7 +85,9 @@ const AH_AML_OPCODE AmlOpcodeInfo[] =
"DefVarPackage := VarPackageOp PkgLength VarNumElements PackageElementList"},
{0x14, 0x14, "0x14", "MethodOp", "TermObject", "NameString ByteData", "TermList",
"DefMethod := MethodOp PkgLength NameString MethodFlags TermList"},
- {0x15, 0x2D, "0x15-0x2D", NULL, NULL, NULL, NULL,
+ {0x15, 0x15, "0x15", "ExternalOp", "NameObject", "NameString ByteData ByteData", NULL,
+ "DefExternal := ExternalOp NameString ObjectType ArgumentCount"},
+ {0x16, 0x2D, "0x16-0x2D", NULL, NULL, NULL, NULL,
NULL},
{0x2E, 0x2E, "0x2E", "DualNamePrefix", "NameObject", "NameSeg NameSeg", NULL,
"DualNamePath := DualNamePrefix NameSeg NameSeg"},
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index cd841c3037f1..95ea29ebf1c0 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -397,7 +397,7 @@ AhDecodeAmlOpcode (
return;
}
- Opcode = ACPI_STRTOUL (OpcodeString, NULL, 16);
+ Opcode = strtoul (OpcodeString, NULL, 16);
if (Opcode > ACPI_UINT16_MAX)
{
printf ("Invalid opcode (more than 16 bits)\n");
@@ -1025,7 +1025,7 @@ AhDecodeException (
/* Decode a single user-supplied exception code */
- Status = ACPI_STRTOUL (HexString, NULL, 16);
+ Status = strtoul (HexString, NULL, 16);
if (!Status)
{
printf ("%s: Invalid hexadecimal exception code value\n", HexString);
diff --git a/source/tools/acpinames/antables.c b/source/tools/acpinames/antables.c
index 59922fe1760e..9646ba4974f7 100644
--- a/source/tools/acpinames/antables.c
+++ b/source/tools/acpinames/antables.c
@@ -124,7 +124,7 @@ AeBuildLocalTables (
return (AE_NO_MEMORY);
}
- ACPI_MEMSET (LocalXSDT, 0, XsdtSize);
+ memset (LocalXSDT, 0, XsdtSize);
ACPI_MOVE_NAME (LocalXSDT->Header.Signature, ACPI_SIG_XSDT);
LocalXSDT->Header.Length = XsdtSize;
LocalXSDT->Header.Revision = 1;
@@ -173,9 +173,9 @@ AeBuildLocalTables (
/* Build an RSDP */
- ACPI_MEMSET (&LocalRSDP, 0, sizeof (ACPI_TABLE_RSDP));
+ memset (&LocalRSDP, 0, sizeof (ACPI_TABLE_RSDP));
ACPI_MAKE_RSDP_SIG (LocalRSDP.Signature);
- ACPI_MEMCPY (LocalRSDP.OemId, "I_TEST", 6);
+ memcpy (LocalRSDP.OemId, "I_TEST", 6);
LocalRSDP.Revision = 2;
LocalRSDP.XsdtPhysicalAddress = ACPI_PTR_TO_PHYSADDR (LocalXSDT);
LocalRSDP.Length = sizeof (ACPI_TABLE_XSDT);
@@ -217,7 +217,7 @@ AeBuildLocalTables (
/*
* Build a local FADT so we can test the hardware/event init
*/
- ACPI_MEMSET (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
+ memset (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT));
ACPI_MOVE_NAME (LocalFADT.Header.Signature, ACPI_SIG_FADT);
/* Setup FADT header and DSDT/FACS addresses */
@@ -268,7 +268,7 @@ AeBuildLocalTables (
/* Build a FACS */
- ACPI_MEMSET (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
+ memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS);
LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
diff --git a/source/tools/acpisrc/acpisrc.h b/source/tools/acpisrc/acpisrc.h
index 1eb21aa39a84..d5dc9f81d31e 100644
--- a/source/tools/acpisrc/acpisrc.h
+++ b/source/tools/acpisrc/acpisrc.h
@@ -261,11 +261,6 @@ AsRemoveLine (
char *Keyword);
void
-AsRemoveMacro (
- char *Buffer,
- char *Keyword);
-
-void
AsCheckForBraces (
char *Buffer,
char *Filename);
diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c
index fca19b81fd0f..5b0f5f461596 100644
--- a/source/tools/acpisrc/asconvrt.c
+++ b/source/tools/acpisrc/asconvrt.c
@@ -272,8 +272,8 @@ AsMatchValidToken (
if ((*SubBuffer == '\n') ||
(!(*SubBuffer)))
{
- AsPrint ("Unbalanced quoted string", 1, Filename);
- printf (" %.32s\n", StringStart);
+ AsPrint ("Unbalanced quoted string",1, Filename);
+ printf (" %.32s (line %u)\n", StringStart, TotalLines);
break;
}
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index 9c4ea7aabc55..1e686cff1a71 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -306,7 +306,6 @@ AsConvertFile (
ACPI_STRING_TABLE *StringTable;
ACPI_IDENTIFIER_TABLE *ConditionalTable;
ACPI_IDENTIFIER_TABLE *LineTable;
- ACPI_IDENTIFIER_TABLE *MacroTable;
ACPI_TYPED_IDENTIFIER_TABLE *StructTable;
ACPI_IDENTIFIER_TABLE *SpecialMacroTable;
@@ -319,7 +318,6 @@ AsConvertFile (
StringTable = ConversionTable->SourceStringTable;
LineTable = ConversionTable->SourceLineTable;
ConditionalTable = ConversionTable->SourceConditionalTable;
- MacroTable = ConversionTable->SourceMacroTable;
StructTable = ConversionTable->SourceStructTable;
SpecialMacroTable = ConversionTable->SourceSpecialMacroTable;
break;
@@ -330,7 +328,6 @@ AsConvertFile (
StringTable = ConversionTable->HeaderStringTable;
LineTable = ConversionTable->HeaderLineTable;
ConditionalTable = ConversionTable->HeaderConditionalTable;
- MacroTable = ConversionTable->HeaderMacroTable;
StructTable = ConversionTable->HeaderStructTable;
SpecialMacroTable = ConversionTable->HeaderSpecialMacroTable;
break;
@@ -341,7 +338,6 @@ AsConvertFile (
StringTable = ConversionTable->PatchStringTable;
LineTable = ConversionTable->PatchLineTable;
ConditionalTable = ConversionTable->PatchConditionalTable;
- MacroTable = ConversionTable->PatchMacroTable;
StructTable = ConversionTable->PatchStructTable;
SpecialMacroTable = ConversionTable->PatchSpecialMacroTable;
break;
@@ -400,6 +396,7 @@ AsConvertFile (
}
}
+#ifdef _OBSOLETE_FUNCTIONS
if (MacroTable)
{
for (i = 0; MacroTable[i].Identifier; i++)
@@ -407,6 +404,7 @@ AsConvertFile (
AsRemoveMacro (FileBuffer, MacroTable[i].Identifier);
}
}
+#endif
if (StructTable)
{
diff --git a/source/tools/acpisrc/asremove.c b/source/tools/acpisrc/asremove.c
index 28299a432328..9a4e57c2fae0 100644
--- a/source/tools/acpisrc/asremove.c
+++ b/source/tools/acpisrc/asremove.c
@@ -299,6 +299,7 @@ AsRemoveConditionalCompile (
}
+#ifdef _OBSOLETE_FUNCTIONS
/******************************************************************************
*
* FUNCTION: AsRemoveMacro
@@ -308,6 +309,11 @@ AsRemoveConditionalCompile (
*
******************************************************************************/
+NOTE: This function is no longer used and is commented out for now.
+
+Also, it appears to have one or more bugs in it. It can incorrectly remove
+lines of code, producing some garbage.
+
void
AsRemoveMacro (
char *Buffer,
@@ -368,7 +374,7 @@ AsRemoveMacro (
}
}
}
-
+#endif
/******************************************************************************
*
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 073971fb25f1..a10681ef0915 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -720,14 +720,6 @@ ACPI_IDENTIFIER_TABLE LinuxAddStruct[] = {
};
-ACPI_IDENTIFIER_TABLE LinuxEliminateMacros[] = {
-
- {"ACPI_GET_ADDRESS"},
- {"ACPI_VALID_ADDRESS"},
- {NULL}
-};
-
-
ACPI_IDENTIFIER_TABLE LinuxEliminateLines_C[] = {
{"#define __"},
@@ -809,7 +801,7 @@ ACPI_CONVERSION_TABLE LinuxConversionTable = {
LinuxDataTypes,
LinuxEliminateLines_C,
NULL,
- LinuxEliminateMacros,
+ NULL,
AcpiIdentifiers,
NULL,
(CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES |
diff --git a/source/tools/acpisrc/asutils.c b/source/tools/acpisrc/asutils.c
index f4ce703fe74f..03a45b910079 100644
--- a/source/tools/acpisrc/asutils.c
+++ b/source/tools/acpisrc/asutils.c
@@ -72,7 +72,7 @@ AsStrlwr (
{
for (String = SrcString; *String; String++)
{
- *String = (char) ACPI_TOLOWER (*String);
+ *String = (char) tolower (*String);
}
}
}
generated by cgit v1.3 (git 2.53.0) at 2026-07-25 21:39:15 +0000