diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-10 21:30:04 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-10 21:30:04 +0000 |
| commit | e8991236d498c9646c20a8acf0236cf3342dad6f (patch) | |
| tree | b4bd3052883fca1145eaa389311d46371584f6d9 /source/components | |
| parent | d4e301bc21b6911ed7f5d6a86659c4882fa7ab55 (diff) | |
| download | src-e8991236d498c9646c20a8acf0236cf3342dad6f.tar.gz src-e8991236d498c9646c20a8acf0236cf3342dad6f.zip | |
Import ACPICA 20141107.vendor/acpica/20141107
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=274357
svn path=/vendor-sys/acpica/20141107/; revision=274358; tag=vendor/acpica/20141107
Diffstat (limited to 'source/components')
133 files changed, 1060 insertions, 332 deletions
diff --git a/source/components/debugger/dbconvert.c b/source/components/debugger/dbconvert.c index ad8b13967cce..cf7502d11b2d 100644 --- a/source/components/debugger/dbconvert.c +++ b/source/components/debugger/dbconvert.c @@ -361,7 +361,9 @@ AcpiDbEncodePldBuffer ( Dword = 0; ACPI_PLD_SET_REVISION (&Dword, PldInfo->Revision); ACPI_PLD_SET_IGNORE_COLOR (&Dword, PldInfo->IgnoreColor); - ACPI_PLD_SET_COLOR (&Dword, PldInfo->Color); + ACPI_PLD_SET_RED (&Dword, PldInfo->Red); + ACPI_PLD_SET_GREEN (&Dword, PldInfo->Green); + ACPI_PLD_SET_BLUE (&Dword, PldInfo->Blue); ACPI_MOVE_32_TO_32 (&Buffer[0], &Dword); /* Second 32 bits */ @@ -480,45 +482,47 @@ AcpiDbDumpPldBuffer ( /* First 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Revision", PldInfo->Revision); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "IgnoreColor", PldInfo->IgnoreColor); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Color", PldInfo->Color); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Revision", PldInfo->Revision); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_IgnoreColor", PldInfo->IgnoreColor); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Red", PldInfo->Red); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Green", PldInfo->Green); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Blue", PldInfo->Blue); /* Second 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Width", PldInfo->Width); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Height", PldInfo->Height); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Width", PldInfo->Width); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Height", PldInfo->Height); /* Third 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "UserVisible", PldInfo->UserVisible); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Dock", PldInfo->Dock); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Lid", PldInfo->Lid); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Panel", PldInfo->Panel); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "VerticalPosition", PldInfo->VerticalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "HorizontalPosition", PldInfo->HorizontalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Shape", PldInfo->Shape); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupOrientation", PldInfo->GroupOrientation); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupToken", PldInfo->GroupToken); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupPosition", PldInfo->GroupPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Bay", PldInfo->Bay); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_UserVisible", PldInfo->UserVisible); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Dock", PldInfo->Dock); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Lid", PldInfo->Lid); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Panel", PldInfo->Panel); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_VerticalPosition", PldInfo->VerticalPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_HorizontalPosition", PldInfo->HorizontalPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Shape", PldInfo->Shape); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_GroupOrientation", PldInfo->GroupOrientation); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_GroupToken", PldInfo->GroupToken); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_GroupPosition", PldInfo->GroupPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Bay", PldInfo->Bay); /* Fourth 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Ejectable", PldInfo->Ejectable); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "OspmEjectRequired", PldInfo->OspmEjectRequired); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "CabinetNumber", PldInfo->CabinetNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "CardCageNumber", PldInfo->CardCageNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Reference", PldInfo->Reference); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Rotation", PldInfo->Rotation); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Order", PldInfo->Order); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Ejectable", PldInfo->Ejectable); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_EjectRequired", PldInfo->OspmEjectRequired); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_CabinetNumber", PldInfo->CabinetNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_CardCageNumber", PldInfo->CardCageNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Reference", PldInfo->Reference); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Rotation", PldInfo->Rotation); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_Order", PldInfo->Order); /* Fifth 32-bit dword */ if (BufferDesc->Buffer.Length > 16) { - AcpiOsPrintf (ACPI_PLD_OUTPUT, "VerticalOffset", PldInfo->VerticalOffset); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "HorizontalOffset", PldInfo->HorizontalOffset); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_VerticalOffset", PldInfo->VerticalOffset); + AcpiOsPrintf (ACPI_PLD_OUTPUT, "PLD_HorizontalOffset", PldInfo->HorizontalOffset); } ACPI_FREE (PldInfo); diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c index 973e269e0944..afb0842e796d 100644 --- a/source/components/disassembler/dmbuffer.c +++ b/source/components/disassembler/dmbuffer.c @@ -79,6 +79,51 @@ AcpiDmPldBuffer ( #define ACPI_BUFFER_BYTES_PER_LINE 8 +/* Strings for ToPld */ + +static char *DmPanelList[] = +{ + "TOP", + "BOTTOM", + "LEFT", + "RIGHT", + "FRONT", + "BACK", + "UNKNOWN", + NULL +}; + +static char *DmVerticalPositionList[] = +{ + "UPPER", + "CENTER", + "LOWER", + NULL +}; + +static char *DmHorizontalPositionList[] = +{ + "LEFT", + "CENTER", + "RIGHT", + NULL +}; + +static char *DmShapeList[] = +{ + "ROUND", + "OVAL", + "SQUARE", + "VERTICALRECTANGLE", + "HORIZONTALRECTANGLE", + "VERTICALTRAPEZOID", + "HORIZONTALTRAPEZOID", + "UNKNOWN", + "CHAMFERED", + NULL +}; + + /******************************************************************************* * * FUNCTION: AcpiDmDisasmByteList @@ -232,8 +277,9 @@ AcpiDmByteList ( break; case ACPI_DASM_PLD_METHOD: - +#if 0 AcpiDmDisasmByteList (Info->Level, ByteData, ByteCount); +#endif AcpiDmPldBuffer (Info->Level, ByteData, ByteCount); break; @@ -434,11 +480,12 @@ AcpiDmIsUnicodeBuffer ( return (FALSE); } - /* For each word, 1st byte must be ascii, 2nd byte must be zero */ + /* For each word, 1st byte must be ascii (1-0x7F), 2nd byte must be zero */ for (i = 0; i < (ByteCount - 2); i += 2) { - if ((!ACPI_IS_PRINT (ByteData[i])) || + if ((ByteData[i] == 0) || + (ByteData[i] > 0x7F) || (ByteData[(ACPI_SIZE) i + 1] != 0)) { return (FALSE); @@ -534,9 +581,14 @@ AcpiDmIsPldBuffer ( ACPI_PARSE_OBJECT *Op) { ACPI_NAMESPACE_NODE *Node; + ACPI_PARSE_OBJECT *SizeOp; ACPI_PARSE_OBJECT *ParentOp; + /* Buffer size is the buffer argument */ + + SizeOp = Op->Common.Value.Arg; + ParentOp = Op->Common.Parent; if (!ParentOp) { @@ -551,6 +603,9 @@ AcpiDmIsPldBuffer ( if (ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__PLD)) { + /* Ignore the Size argument in the disassembly of this buffer op */ + + SizeOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; return (TRUE); } @@ -573,6 +628,9 @@ AcpiDmIsPldBuffer ( if (ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__PLD)) { + /* Ignore the Size argument in the disassembly of this buffer op */ + + SizeOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; return (TRUE); } } @@ -584,6 +642,51 @@ AcpiDmIsPldBuffer ( /******************************************************************************* * + * FUNCTION: AcpiDmFindNameByIndex + * + * PARAMETERS: Index - Index of array to check + * List - Array to reference + * + * RETURN: String from List or empty string + * + * DESCRIPTION: Finds and returns the char string located at the given index + * position in List. + * + ******************************************************************************/ + +static char * +AcpiDmFindNameByIndex ( + UINT64 Index, + char **List) +{ + char *Str; + UINT32 i; + + + /* Bounds check */ + + Str = List[0]; + i = 0; + + while(Str) + { + i++; + Str = List[i]; + } + + if (Index >= i) + { + /* TBD: Add error msg */ + + return (""); + } + + return (List[Index]); +} + + +/******************************************************************************* + * * FUNCTION: AcpiDmPldBuffer * * PARAMETERS: Level - Current source code indentation level @@ -596,9 +699,12 @@ AcpiDmIsPldBuffer ( * ******************************************************************************/ -#define ACPI_PLD_OUTPUT08 "%*.s/* %18s : %-6.2X */\n", ACPI_MUL_4 (Level), " " -#define ACPI_PLD_OUTPUT16 "%*.s/* %18s : %-6.4X */\n", ACPI_MUL_4 (Level), " " -#define ACPI_PLD_OUTPUT24 "%*.s/* %18s : %-6.6X */\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT08 "%*.s%-18s = 0x%X,\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT08P "%*.s%-18s = 0x%X)\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT16 "%*.s%-18s = 0x%X,\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT16P "%*.s%-18s = 0x%X)\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT24 "%*.s%-18s = 0x%X,\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUTSTR "%*.s%-18s = \"%s\",\n", ACPI_MUL_4 (Level), " " static void AcpiDmPldBuffer ( @@ -625,47 +731,63 @@ AcpiDmPldBuffer ( return; } + AcpiOsPrintf ("\n"); + /* First 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Revision", PldInfo->Revision); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "IgnoreColor", PldInfo->IgnoreColor); - AcpiOsPrintf (ACPI_PLD_OUTPUT24,"Color", PldInfo->Color); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Revision", PldInfo->Revision); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_IgnoreColor", PldInfo->IgnoreColor); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Red", PldInfo->Red); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Green", PldInfo->Green); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Blue", PldInfo->Blue); /* Second 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT16,"Width", PldInfo->Width); - AcpiOsPrintf (ACPI_PLD_OUTPUT16,"Height", PldInfo->Height); + AcpiOsPrintf (ACPI_PLD_OUTPUT16, "PLD_Width", PldInfo->Width); + AcpiOsPrintf (ACPI_PLD_OUTPUT16, "PLD_Height", PldInfo->Height); /* Third 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "UserVisible", PldInfo->UserVisible); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Dock", PldInfo->Dock); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Lid", PldInfo->Lid); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Panel", PldInfo->Panel); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "VerticalPosition", PldInfo->VerticalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "HorizontalPosition", PldInfo->HorizontalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Shape", PldInfo->Shape); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupOrientation", PldInfo->GroupOrientation); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupToken", PldInfo->GroupToken); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupPosition", PldInfo->GroupPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Bay", PldInfo->Bay); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_UserVisible", PldInfo->UserVisible); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Dock", PldInfo->Dock); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Lid", PldInfo->Lid); + AcpiOsPrintf (ACPI_PLD_OUTPUTSTR, "PLD_Panel", + AcpiDmFindNameByIndex(PldInfo->Panel, DmPanelList)); + AcpiOsPrintf (ACPI_PLD_OUTPUTSTR, "PLD_VerticalPosition", + AcpiDmFindNameByIndex(PldInfo->VerticalPosition, DmVerticalPositionList)); + AcpiOsPrintf (ACPI_PLD_OUTPUTSTR, "PLD_HorizontalPosition", + AcpiDmFindNameByIndex(PldInfo->HorizontalPosition, DmHorizontalPositionList)); + AcpiOsPrintf (ACPI_PLD_OUTPUTSTR, "PLD_Shape", + AcpiDmFindNameByIndex(PldInfo->Shape, DmShapeList)); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_GroupOrientation", PldInfo->GroupOrientation); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_GroupToken", PldInfo->GroupToken); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_GroupPosition", PldInfo->GroupPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Bay", PldInfo->Bay); /* Fourth 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Ejectable", PldInfo->Ejectable); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "OspmEjectRequired", PldInfo->OspmEjectRequired); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "CabinetNumber", PldInfo->CabinetNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "CardCageNumber", PldInfo->CardCageNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Reference", PldInfo->Reference); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Rotation", PldInfo->Rotation); - AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Order", PldInfo->Order); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Ejectable", PldInfo->Ejectable); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_EjectRequired", PldInfo->OspmEjectRequired); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_CabinetNumber", PldInfo->CabinetNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_CardCageNumber", PldInfo->CardCageNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Reference", PldInfo->Reference); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Rotation", PldInfo->Rotation); + + if (ByteCount < ACPI_PLD_REV1_BUFFER_SIZE) + { + AcpiOsPrintf (ACPI_PLD_OUTPUT08P, "PLD_Order", PldInfo->Order); + } + else + { + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "PLD_Order", PldInfo->Order); + } /* Fifth 32-bit dword */ if (ByteCount >= ACPI_PLD_REV1_BUFFER_SIZE) { - AcpiOsPrintf (ACPI_PLD_OUTPUT16,"VerticalOffset", PldInfo->VerticalOffset); - AcpiOsPrintf (ACPI_PLD_OUTPUT16,"HorizontalOffset", PldInfo->HorizontalOffset); + AcpiOsPrintf (ACPI_PLD_OUTPUT16, "PLD_VerticalOffset", PldInfo->VerticalOffset); + AcpiOsPrintf (ACPI_PLD_OUTPUT16P, "PLD_HorizontalOffset", PldInfo->HorizontalOffset); } ACPI_FREE (PldInfo); @@ -692,6 +814,7 @@ AcpiDmUnicode ( UINT16 *WordData; UINT32 WordCount; UINT32 i; + int OutputValue; /* Extract the buffer info as a WORD buffer */ @@ -704,7 +827,23 @@ AcpiDmUnicode ( AcpiOsPrintf ("\""); for (i = 0; i < (WordCount - 1); i++) { - AcpiOsPrintf ("%c", (int) WordData[i]); + OutputValue = (int) WordData[i]; + + /* Handle values that must be escaped */ + + if ((OutputValue == '\"') || + (OutputValue == '\\')) + { + AcpiOsPrintf ("\\%c", OutputValue); + } + else if (!ACPI_IS_PRINT (OutputValue)) + { + AcpiOsPrintf ("\\x%2.2X", OutputValue); + } + else + { + AcpiOsPrintf ("%c", OutputValue); + } } AcpiOsPrintf ("\")"); diff --git a/source/components/disassembler/dmcstyle.c b/source/components/disassembler/dmcstyle.c new file mode 100644 index 000000000000..4db1b96cef73 --- /dev/null +++ b/source/components/disassembler/dmcstyle.c @@ -0,0 +1,773 @@ +/******************************************************************************* + * + * Module Name: dmcstyle - Support for C-style operator disassembly + * + ******************************************************************************/ + +/* + * Copyright (C) 2000 - 2014, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#include "acpi.h" +#include "accommon.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdisasm.h" +#include "acdebug.h" + +#ifdef ACPI_DISASSEMBLER + +#define _COMPONENT ACPI_CA_DEBUGGER + ACPI_MODULE_NAME ("dmcstyle") + + +/* Local prototypes */ + +static char * +AcpiDmGetCompoundSymbol ( + UINT16 AslOpcode); + +static void +AcpiDmPromoteTarget ( + ACPI_PARSE_OBJECT *Op, + ACPI_PARSE_OBJECT *Target); + +static BOOLEAN +AcpiDmIsValidTarget ( + ACPI_PARSE_OBJECT *Op); + +static BOOLEAN +AcpiDmIsTargetAnOperand ( + ACPI_PARSE_OBJECT *Target, + ACPI_PARSE_OBJECT *Operand, + BOOLEAN TopLevel); + + +/******************************************************************************* + * + * FUNCTION: AcpiDmCheckForSymbolicOpcode + * + * PARAMETERS: Op - Current parse object + * Walk - Current parse tree walk info + * + * RETURN: TRUE if opcode can be converted to symbolic, FALSE otherwise + * + * DESCRIPTION: This is the main code that implements disassembly of AML code + * to C-style operators. Called during descending phase of the + * parse tree walk. + * + ******************************************************************************/ + +BOOLEAN +AcpiDmCheckForSymbolicOpcode ( + ACPI_PARSE_OBJECT *Op, + ACPI_OP_WALK_INFO *Info) +{ + char *OperatorSymbol = NULL; + ACPI_PARSE_OBJECT *Child1; + ACPI_PARSE_OBJECT *Child2; + ACPI_PARSE_OBJECT *Target; + + + /* Exit immediately if ASL+ not enabled */ + + if (!AcpiGbl_CstyleDisassembly) + { + return (FALSE); + } + + /* Get the first operand */ + + Child1 = AcpiPsGetArg (Op, 0); + if (!Child1) + { + return (FALSE); + } + + /* Get the second operand */ + + Child2 = Child1->Common.Next; + + /* Setup the operator string for this opcode */ + + switch (Op->Common.AmlOpcode) + { + case AML_ADD_OP: + OperatorSymbol = " + "; + break; + + case AML_SUBTRACT_OP: + OperatorSymbol = " - "; + break; + + case AML_MULTIPLY_OP: + OperatorSymbol = " * "; + break; + + case AML_DIVIDE_OP: + OperatorSymbol = " / "; + break; + + case AML_MOD_OP: + OperatorSymbol = " % "; + break; + + case AML_SHIFT_LEFT_OP: + OperatorSymbol = " << "; + break; + + case AML_SHIFT_RIGHT_OP: + OperatorSymbol = " >> "; + break; + + case AML_BIT_AND_OP: + OperatorSymbol = " & "; + break; + + case AML_BIT_OR_OP: + OperatorSymbol = " | "; + break; + + case AML_BIT_XOR_OP: + OperatorSymbol = " ^ "; + break; + + /* Logical operators, no target */ + + case AML_LAND_OP: + OperatorSymbol = " && "; + break; + + case AML_LEQUAL_OP: + OperatorSymbol = " == "; + break; + + case AML_LGREATER_OP: + OperatorSymbol = " > "; + break; + + case AML_LLESS_OP: + OperatorSymbol = " < "; + break; + + case AML_LOR_OP: + OperatorSymbol = " || "; + break; + + case AML_LNOT_OP: + /* + * Check for the LNOT sub-opcodes. These correspond to + * LNotEqual, LLessEqual, and LGreaterEqual. There are + * no actual AML opcodes for these operators. + */ + switch (Child1->Common.AmlOpcode) + { + case AML_LEQUAL_OP: + OperatorSymbol = " != "; + break; + + case AML_LGREATER_OP: + OperatorSymbol = " <= "; + break; + + case AML_LLESS_OP: + OperatorSymbol = " >= "; + break; + + default: + + /* Unary LNOT case, emit "!" immediately */ + + AcpiOsPrintf ("!"); + return (TRUE); + } + + Child1->Common.DisasmOpcode = ACPI_DASM_LNOT_SUFFIX; + Op->Common.DisasmOpcode = ACPI_DASM_LNOT_PREFIX; + + /* Save symbol string in the next child (not peer) */ + + Child2 = AcpiPsGetArg (Child1, 0); + if (!Child2) + { + return (FALSE); + } + + Child2->Common.OperatorSymbol = OperatorSymbol; + return (TRUE); + +#ifdef INDEX_SUPPORT + case AML_INDEX_OP: + Child1->Common.OperatorSymbol = " ["; + Child2->Common.OperatorSymbol = "]"; + break; +#endif + + /* Unary operators */ + + case AML_DECREMENT_OP: + OperatorSymbol = "--"; + break; + + case AML_INCREMENT_OP: + OperatorSymbol = "++"; + break; + + case AML_BIT_NOT_OP: + case AML_STORE_OP: + OperatorSymbol = NULL; + break; + + default: + return (FALSE); + } + + if (Child1->Common.DisasmOpcode == ACPI_DASM_LNOT_SUFFIX) + { + return (TRUE); + } + + /* + * This is the key to how the disassembly of the C-style operators + * works. We save the operator symbol in the first child, thus + * deferring symbol output until after the first operand has been + * emitted. + */ + if (!Child1->Common.OperatorSymbol) + { + Child1->Common.OperatorSymbol = OperatorSymbol; + } + + /* + * Check for a valid target as the 3rd (or sometimes 2nd) operand + * + * Compound assignment operator support: + * Attempt to optimize constructs of the form: + * Add (Local1, 0xFF, Local1) + * to: + * Local1 += 0xFF + * + * Only the math operators and Store() have a target. + * Logicals have no target. + */ + switch (Op->Common.AmlOpcode) + { + case AML_ADD_OP: + case AML_SUBTRACT_OP: + case AML_MULTIPLY_OP: + case AML_DIVIDE_OP: + case AML_MOD_OP: + case AML_SHIFT_LEFT_OP: + case AML_SHIFT_RIGHT_OP: + case AML_BIT_AND_OP: + case AML_BIT_OR_OP: + case AML_BIT_XOR_OP: + + /* Target is 3rd operand */ + + Target = Child2->Common.Next; + if (Op->Common.AmlOpcode == AML_DIVIDE_OP) + { + /* + * Divide has an extra target operand (Remainder). + * If this extra target is specified, it cannot be converted + * to a C-style operator + */ + if (AcpiDmIsValidTarget (Target)) + { + Child1->Common.OperatorSymbol = NULL; + return (FALSE); + } + + Target->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; + Target = Target->Common.Next; + } + + /* Parser should ensure there is at least a placeholder target */ + + if (!Target) + { + return (FALSE); + } + + if (!AcpiDmIsValidTarget (Target)) + { + /* Not a valid target (placeholder only, from parser) */ + break; + } + + /* + * Promote the target up to the first child in the parse + * tree. This is done because the target will be output + * first, in the form: + * <Target> = Operands... + */ + AcpiDmPromoteTarget (Op, Target); + + /* + * Check for possible conversion to a "Compound Assignment". + * + * Determine if either operand is the same as the target + * and display compound assignment operator and other operand. + */ + if ((AcpiDmIsTargetAnOperand (Target, Child1, TRUE)) || + (AcpiDmIsTargetAnOperand (Target, Child2, TRUE))) + { + Target->Common.OperatorSymbol = + AcpiDmGetCompoundSymbol (Op->Common.AmlOpcode); + + /* Convert operator to compound assignment */ + + Op->Common.DisasmFlags |= ACPI_PARSEOP_COMPOUND; + Child1->Common.OperatorSymbol = NULL; + return (TRUE); + } + + /* + * If we are within a C-style expression, emit an extra open + * paren. Implemented by examining the parent op. + */ + switch (Op->Common.Parent->Common.AmlOpcode) + { + case AML_ADD_OP: + case AML_SUBTRACT_OP: + case AML_MULTIPLY_OP: + case AML_DIVIDE_OP: + case AML_MOD_OP: + case AML_SHIFT_LEFT_OP: + case AML_SHIFT_RIGHT_OP: + case AML_BIT_AND_OP: + case AML_BIT_OR_OP: + case AML_BIT_XOR_OP: + case AML_LAND_OP: + case AML_LEQUAL_OP: + case AML_LGREATER_OP: + case AML_LLESS_OP: + case AML_LOR_OP: + + Op->Common.DisasmFlags |= ACPI_PARSEOP_ASSIGNMENT; + AcpiOsPrintf ("("); + break; + + default: + break; + } + + /* Normal output for ASL/AML operators with a target operand */ + + Target->Common.OperatorSymbol = " = ("; + return (TRUE); + + /* Binary operators, no parens */ + + case AML_DECREMENT_OP: + case AML_INCREMENT_OP: + return (TRUE); + +#ifdef INDEX_SUPPORT + case AML_INDEX_OP: + + /* Target is optional, 3rd operand */ + + Target = Child2->Common.Next; + if (AcpiDmIsValidTarget (Target)) + { + AcpiDmPromoteTarget (Op, Target); + + if (!Target->Common.OperatorSymbol) + { + Target->Common.OperatorSymbol = " = "; + } + } + return (TRUE); +#endif + + case AML_STORE_OP: + /* + * Target is the 2nd operand. + * We know the target is valid, it is not optional. + * In the parse tree, simply swap the target with the + * source so that the target is processed first. + */ + Target = Child1->Common.Next; + AcpiDmPromoteTarget (Op, Target); + + if (!Target->Common.OperatorSymbol) + { + Target->Common.OperatorSymbol = " = "; + } + return (TRUE); + + case AML_BIT_NOT_OP: + + /* Target is optional, 2nd operand */ + + Target = Child1->Common.Next; + if (!Target) + { + return (FALSE); + } + + if (AcpiDmIsValidTarget (Target)) + { + /* Valid target, not a placeholder */ + + AcpiDmPromoteTarget (Op, Target); + Target->Common.OperatorSymbol = " = ~"; + } + else + { + /* No target. Emit this prefix operator immediately */ + + AcpiOsPrintf ("~"); + } + return (TRUE); + + default: + break; + } + + /* All other operators, emit an open paren */ + + AcpiOsPrintf ("("); + return (TRUE); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmCloseOperator + * + * PARAMETERS: Op - Current parse object + * + * RETURN: None + * + * DESCRIPTION: Closes an operator by adding a closing parentheses if and + * when necessary. Called during ascending phase of the + * parse tree walk. + * + ******************************************************************************/ + +void +AcpiDmCloseOperator ( + ACPI_PARSE_OBJECT *Op) +{ + + /* Always emit paren if ASL+ disassembly disabled */ + + if (!AcpiGbl_CstyleDisassembly) + { + AcpiOsPrintf (")"); + return; + } + + /* Check if we need to add an additional closing paren */ + + switch (Op->Common.AmlOpcode) + { + case AML_ADD_OP: + case AML_SUBTRACT_OP: + case AML_MULTIPLY_OP: + case AML_DIVIDE_OP: + case AML_MOD_OP: + case AML_SHIFT_LEFT_OP: + case AML_SHIFT_RIGHT_OP: + case AML_BIT_AND_OP: + case AML_BIT_OR_OP: + case AML_BIT_XOR_OP: + case AML_LAND_OP: + case AML_LEQUAL_OP: + case AML_LGREATER_OP: + case AML_LLESS_OP: + case AML_LOR_OP: + + /* Emit paren only if this is not a compound assignment */ + + if (Op->Common.DisasmFlags & ACPI_PARSEOP_COMPOUND) + { + return; + } + + /* Emit extra close paren for assignment within an expression */ + + if (Op->Common.DisasmFlags & ACPI_PARSEOP_ASSIGNMENT) + { + AcpiOsPrintf (")"); + } + break; + + + /* No need for parens for these */ + +#ifdef INDEX_SUPPORT + case AML_INDEX_OP: +#endif + case AML_DECREMENT_OP: + case AML_INCREMENT_OP: + case AML_LNOT_OP: + case AML_BIT_NOT_OP: + case AML_STORE_OP: + return; + + default: + + /* Always emit paren for non-ASL+ operators */ + break; + } + + AcpiOsPrintf (")"); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmGetCompoundSymbol + * + * PARAMETERS: AslOpcode + * + * RETURN: String containing the compound assignment symbol + * + * DESCRIPTION: Detect opcodes that can be converted to compound assignment, + * return the appropriate operator string. + * + ******************************************************************************/ + +static char * +AcpiDmGetCompoundSymbol ( + UINT16 AmlOpcode) +{ + char *Symbol; + + + switch (AmlOpcode) + { + case AML_ADD_OP: + Symbol = " += "; + break; + + case AML_SUBTRACT_OP: + Symbol = " -= "; + break; + + case AML_MULTIPLY_OP: + Symbol = " *= "; + break; + + case AML_DIVIDE_OP: + Symbol = " /= "; + break; + + case AML_MOD_OP: + Symbol = " %= "; + break; + + case AML_SHIFT_LEFT_OP: + Symbol = " <<= "; + break; + + case AML_SHIFT_RIGHT_OP: + Symbol = " >>= "; + break; + + case AML_BIT_AND_OP: + Symbol = " &= "; + break; + + case AML_BIT_OR_OP: + Symbol = " |= "; + break; + + case AML_BIT_XOR_OP: + Symbol = " ^= "; + break; + + default: + + /* No operator string for all other opcodes */ + return (NULL); + } + + return (Symbol); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmPromoteTarget + * + * PARAMETERS: Op - Operator parse object + * Target - Target associate with the Op + * + * RETURN: None + * + * DESCRIPTION: Transform the parse tree by moving the target up to the first + * child of the Op. + * + ******************************************************************************/ + +static void +AcpiDmPromoteTarget ( + ACPI_PARSE_OBJECT *Op, + ACPI_PARSE_OBJECT *Target) +{ + ACPI_PARSE_OBJECT *Child; + + + /* Link target directly to the Op as first child */ + + Child = Op->Common.Value.Arg; + Op->Common.Value.Arg = Target; + Target->Common.Next = Child; + + /* Find the last peer, it is linked to the target. Unlink it. */ + + while (Child->Common.Next != Target) + { + Child = Child->Common.Next; + } + + Child->Common.Next = NULL; +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmIsValidTarget + * + * PARAMETERS: Target - Target Op from the parse tree + * + * RETURN: TRUE if the Target is real. FALSE if it is just a placeholder + * Op that was inserted by the parser. + * + * DESCRIPTION: Determine if a Target Op is a placeholder Op or a real Target. + * In other words, determine if the optional target is used or + * not. + * + ******************************************************************************/ + +static BOOLEAN +AcpiDmIsValidTarget ( + ACPI_PARSE_OBJECT *Target) +{ + + if ((Target->Common.AmlOpcode == AML_INT_NAMEPATH_OP) && + (Target->Common.Value.Arg == NULL)) + { + return (FALSE); + } + + return (TRUE); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmIsTargetAnOperand + * + * PARAMETERS: Target - Target associated with the expression + * Operand - An operand associated with expression + * + * RETURN: TRUE if expression can be converted to a compound assignment. + * FALSE otherwise. + * + * DESCRIPTION: Determine if the Target duplicates the operand, in order to + * detect if the expression can be converted to a compound + * assigment. (+=, *=, etc.) + * + ******************************************************************************/ + +static BOOLEAN +AcpiDmIsTargetAnOperand ( + ACPI_PARSE_OBJECT *Target, + ACPI_PARSE_OBJECT *Operand, + BOOLEAN TopLevel) +{ + const ACPI_OPCODE_INFO *OpInfo; + BOOLEAN Same; + + + /* + * Opcodes must match. Note: ignoring the difference between nameseg + * and namepath for now. May be needed later. + */ + if (Target->Common.AmlOpcode != Operand->Common.AmlOpcode) + { + return (FALSE); + } + + /* Nodes should match, even if they are NULL */ + + if (Target->Common.Node != Operand->Common.Node) + { + return (FALSE); + } + + /* Determine if a child exists */ + + OpInfo = AcpiPsGetOpcodeInfo (Operand->Common.AmlOpcode); + if (OpInfo->Flags & AML_HAS_ARGS) + { + Same = AcpiDmIsTargetAnOperand (Target->Common.Value.Arg, + Operand->Common.Value.Arg, FALSE); + if (!Same) + { + return (FALSE); + } + } + + /* Check the next peer, as long as we are not at the top level */ + + if ((!TopLevel) && + Target->Common.Next) + { + Same = AcpiDmIsTargetAnOperand (Target->Common.Next, + Operand->Common.Next, FALSE); + if (!Same) + { + return (FALSE); + } + } + + /* Supress the duplicate operand at the top-level */ + + if (TopLevel) + { + Operand->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; + } + return (TRUE); +} + +#endif diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c index e3d9e6918e4c..e356e389927e 100644 --- a/source/components/disassembler/dmopcode.c +++ b/source/components/disassembler/dmopcode.c @@ -54,6 +54,7 @@ #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dmopcode") + /* Local prototypes */ static void @@ -567,7 +568,6 @@ AcpiDmRegionFlags ( ACPI_PARSE_OBJECT *Op) { - /* The next Op contains the SpaceId */ Op = AcpiPsGetDepthNext (NULL, Op); @@ -637,7 +637,6 @@ AcpiDmMatchKeyword ( ACPI_PARSE_OBJECT *Op) { - if (((UINT32) Op->Common.Value.Integer) > ACPI_MAX_MATCH_OPCODE) { AcpiOsPrintf ("/* Unknown Match Keyword encoding */"); @@ -694,27 +693,27 @@ AcpiDmDisassembleOneOp ( case ACPI_DASM_LNOT_SUFFIX: - switch (Op->Common.AmlOpcode) + if (!AcpiGbl_CstyleDisassembly) { - case AML_LEQUAL_OP: - - AcpiOsPrintf ("LNotEqual"); - break; - - case AML_LGREATER_OP: - - AcpiOsPrintf ("LLessEqual"); - break; - - case AML_LLESS_OP: + switch (Op->Common.AmlOpcode) + { + case AML_LEQUAL_OP: + AcpiOsPrintf ("LNotEqual"); + break; - AcpiOsPrintf ("LGreaterEqual"); - break; + case AML_LGREATER_OP: + AcpiOsPrintf ("LLessEqual"); + break; - default: + case AML_LLESS_OP: + AcpiOsPrintf ("LGreaterEqual"); + break; - break; + default: + break; + } } + Op->Common.DisasmOpcode = 0; Op->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; return; @@ -723,7 +722,6 @@ AcpiDmDisassembleOneOp ( break; } - OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); /* The op and arguments */ @@ -845,7 +843,7 @@ AcpiDmDisassembleOneOp ( else if (AcpiDmIsPldBuffer (Op)) { Op->Common.DisasmOpcode = ACPI_DASM_PLD_METHOD; - AcpiOsPrintf ("Buffer"); + AcpiOsPrintf ("ToPLD ("); } else { diff --git a/source/components/disassembler/dmutils.c b/source/components/disassembler/dmutils.c index 700cfecc3092..c075b6904100 100644 --- a/source/components/disassembler/dmutils.c +++ b/source/components/disassembler/dmutils.c @@ -256,6 +256,13 @@ AcpiDmCommaIfListMember ( if (AcpiDmListType (Op->Common.Parent) & BLOCK_COMMA_LIST) { + /* Exit if Target has been marked IGNORE */ + + if (Op->Common.Next->Common.DisasmFlags & ACPI_PARSEOP_IGNORE) + { + return (FALSE); + } + /* Check for a NULL target operand */ if ((Op->Common.Next->Common.AmlOpcode == AML_INT_NAMEPATH_OP) && @@ -279,7 +286,13 @@ AcpiDmCommaIfListMember ( return (FALSE); } - AcpiOsPrintf (", "); + /* Emit comma only if this is not a C-style operator */ + + if (!Op->Common.OperatorSymbol) + { + AcpiOsPrintf (", "); + } + return (TRUE); } diff --git a/source/components/disassembler/dmwalk.c b/source/components/disassembler/dmwalk.c index 92f27e506224..823ce1856b12 100644 --- a/source/components/disassembler/dmwalk.c +++ b/source/components/disassembler/dmwalk.c @@ -285,7 +285,8 @@ AcpiDmBlockType ( case AML_BUFFER_OP: if ((Op->Common.DisasmOpcode == ACPI_DASM_UNICODE) || - (Op->Common.DisasmOpcode == ACPI_DASM_UUID)) + (Op->Common.DisasmOpcode == ACPI_DASM_UUID) || + (Op->Common.DisasmOpcode == ACPI_DASM_PLD_METHOD)) { return (BLOCK_NONE); } @@ -301,6 +302,17 @@ AcpiDmBlockType ( return (BLOCK_PAREN); + case AML_INT_METHODCALL_OP: + + if (Op->Common.Parent && + ((Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_VAR_PACKAGE_OP))) + { + /* This is a reference to a method, not an invocation */ + + return (BLOCK_NONE); + } + default: OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); @@ -477,13 +489,20 @@ AcpiDmDescendingOp ( * keep track of the current column. */ Info->Count++; - if (Info->Count /* +Info->LastLevel */ > 10) + if (Info->Count /* +Info->LastLevel */ > 12) { Info->Count = 0; AcpiOsPrintf ("\n"); AcpiDmIndent (Info->LastLevel + 1); } + /* If ASL+ is enabled, check for a C-style operator */ + + if (AcpiDmCheckForSymbolicOpcode (Op, Info)) + { + return (AE_OK); + } + /* Print the opcode name */ AcpiDmDisassembleOneOp (NULL, Info, Op); @@ -563,7 +582,6 @@ AcpiDmDescendingOp ( AcpiDmPredefinedDescription (Op); break; - case AML_NAME_OP: /* Check for _HID and related EISAID() */ @@ -572,13 +590,11 @@ AcpiDmDescendingOp ( AcpiOsPrintf (", "); break; - case AML_REGION_OP: AcpiDmRegionFlags (Op); break; - case AML_POWER_RES_OP: /* Mark the next two Ops as part of the parameter list */ @@ -591,7 +607,6 @@ AcpiDmDescendingOp ( NextOp->Common.DisasmFlags |= ACPI_PARSEOP_PARAMLIST; return (AE_OK); - case AML_PROCESSOR_OP: /* Mark the next three Ops as part of the parameter list */ @@ -607,20 +622,17 @@ AcpiDmDescendingOp ( NextOp->Common.DisasmFlags |= ACPI_PARSEOP_PARAMLIST; return (AE_OK); - case AML_MUTEX_OP: case AML_DATA_REGION_OP: AcpiOsPrintf (", "); return (AE_OK); - case AML_EVENT_OP: case AML_ALIAS_OP: return (AE_OK); - case AML_SCOPE_OP: case AML_DEVICE_OP: case AML_THERMAL_ZONE_OP: @@ -628,7 +640,6 @@ AcpiDmDescendingOp ( AcpiOsPrintf (")"); break; - default: AcpiOsPrintf ("*** Unhandled named opcode %X\n", @@ -825,9 +836,9 @@ AcpiDmAscendingOp ( { case BLOCK_PAREN: - /* Completed an op that has arguments, add closing paren */ + /* Completed an op that has arguments, add closing paren if needed */ - AcpiOsPrintf (")"); + AcpiDmCloseOperator (Op); if (Op->Common.AmlOpcode == AML_NAME_OP) { @@ -999,8 +1010,21 @@ AcpiDmAscendingOp ( { Info->Level++; } + + /* + * For ASL+, check for and emit a C-style symbol. If valid, the + * symbol string has been deferred until after the first operand + */ + if (AcpiGbl_CstyleDisassembly) + { + if (Op->Asl.OperatorSymbol) + { + AcpiOsPrintf ("%s", Op->Asl.OperatorSymbol); + Op->Asl.OperatorSymbol = NULL; + } + } + return (AE_OK); } - #endif /* ACPI_DISASSEMBLER */ diff --git a/source/components/dispatcher/dsargs.c b/source/components/dispatcher/dsargs.c index 4c9875e78d90..8595402faa0a 100644 --- a/source/components/dispatcher/dsargs.c +++ b/source/components/dispatcher/dsargs.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSARGS_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dscontrol.c b/source/components/dispatcher/dscontrol.c index 0b48c46f1236..2d943ba313dc 100644 --- a/source/components/dispatcher/dscontrol.c +++ b/source/components/dispatcher/dscontrol.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSCONTROL_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c index a0671166e5c5..93796e625844 100644 --- a/source/components/dispatcher/dsfield.c +++ b/source/components/dispatcher/dsfield.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSFIELD_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/dispatcher/dsinit.c b/source/components/dispatcher/dsinit.c index 3e7977d72c27..9546b0977673 100644 --- a/source/components/dispatcher/dsinit.c +++ b/source/components/dispatcher/dsinit.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSINIT_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/dispatcher/dsmethod.c b/source/components/dispatcher/dsmethod.c index 8d1845b61aef..6ae1b316ffe7 100644 --- a/source/components/dispatcher/dsmethod.c +++ b/source/components/dispatcher/dsmethod.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSMETHOD_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/dispatcher/dsmthdat.c b/source/components/dispatcher/dsmthdat.c index e1c45ced99f7..d8021cfee350 100644 --- a/source/components/dispatcher/dsmthdat.c +++ b/source/components/dispatcher/dsmthdat.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSMTHDAT_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/dispatcher/dsobject.c b/source/components/dispatcher/dsobject.c index 56cd22ea8987..b74b068b3750 100644 --- a/source/components/dispatcher/dsobject.c +++ b/source/components/dispatcher/dsobject.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSOBJECT_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c index 0f53283dacbc..b66617253cd5 100644 --- a/source/components/dispatcher/dsopcode.c +++ b/source/components/dispatcher/dsopcode.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSOPCODE_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dsutils.c b/source/components/dispatcher/dsutils.c index 11803663e80c..d1d2545b1abc 100644 --- a/source/components/dispatcher/dsutils.c +++ b/source/components/dispatcher/dsutils.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSUTILS_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dswexec.c b/source/components/dispatcher/dswexec.c index 5d8276fa9011..5ce55a8b97df 100644 --- a/source/components/dispatcher/dswexec.c +++ b/source/components/dispatcher/dswexec.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSWEXEC_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dswload.c b/source/components/dispatcher/dswload.c index 0cafecd65c69..0495624f4164 100644 --- a/source/components/dispatcher/dswload.c +++ b/source/components/dispatcher/dswload.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSWLOAD_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c index a3490f0a9e99..a25166182955 100644 --- a/source/components/dispatcher/dswload2.c +++ b/source/components/dispatcher/dswload2.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSWLOAD2_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/dispatcher/dswscope.c b/source/components/dispatcher/dswscope.c index 87156918e333..b6defded2a39 100644 --- a/source/components/dispatcher/dswscope.c +++ b/source/components/dispatcher/dswscope.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSWSCOPE_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/dispatcher/dswstate.c b/source/components/dispatcher/dswstate.c index 389a7d068996..7c53f61d515d 100644 --- a/source/components/dispatcher/dswstate.c +++ b/source/components/dispatcher/dswstate.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __DSWSTATE_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/events/evhandler.c b/source/components/events/evhandler.c index 0fd1cba30de3..b5138e9f29d5 100644 --- a/source/components/events/evhandler.c +++ b/source/components/events/evhandler.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVHANDLER_C__ - #include "acpi.h" #include "accommon.h" #include "acevents.h" diff --git a/source/components/events/evregion.c b/source/components/events/evregion.c index 2acafab9aba0..14ac452b0108 100644 --- a/source/components/events/evregion.c +++ b/source/components/events/evregion.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVREGION_C__ - #include "acpi.h" #include "accommon.h" #include "acevents.h" diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c index cd0ca2eea5f0..78c8868b35f8 100644 --- a/source/components/events/evrgnini.c +++ b/source/components/events/evrgnini.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVRGNINI_C__ - #include "acpi.h" #include "accommon.h" #include "acevents.h" diff --git a/source/components/events/evxface.c b/source/components/events/evxface.c index 327fd9b605f6..4e25f615b5cf 100644 --- a/source/components/events/evxface.c +++ b/source/components/events/evxface.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVXFACE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/events/evxfevnt.c b/source/components/events/evxfevnt.c index 3a3cf842077f..e007541dbc89 100644 --- a/source/components/events/evxfevnt.c +++ b/source/components/events/evxfevnt.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVXFEVNT_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c index 79e888ff8053..56f54f347418 100644 --- a/source/components/events/evxfgpe.c +++ b/source/components/events/evxfgpe.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVXFGPE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c index 6b38b7ef8e5f..3a44b3fe55d0 100644 --- a/source/components/events/evxfregn.c +++ b/source/components/events/evxfregn.c @@ -42,7 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EVXFREGN_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c index b5adb96700e1..19230a2bc994 100644 --- a/source/components/executer/exconfig.c +++ b/source/components/executer/exconfig.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXCONFIG_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exconvrt.c b/source/components/executer/exconvrt.c index 9803cb6a0528..355d726286a7 100644 --- a/source/components/executer/exconvrt.c +++ b/source/components/executer/exconvrt.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXCONVRT_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/excreate.c b/source/components/executer/excreate.c index 43168ba46c72..cb8d50de9dd5 100644 --- a/source/components/executer/excreate.c +++ b/source/components/executer/excreate.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXCREATE_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exdebug.c b/source/components/executer/exdebug.c index 5b13d19dca4f..c3ee4b1e523c 100644 --- a/source/components/executer/exdebug.c +++ b/source/components/executer/exdebug.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXDEBUG_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c index 6e7de67bf880..48591531c418 100644 --- a/source/components/executer/exdump.c +++ b/source/components/executer/exdump.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXDUMP_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exfield.c b/source/components/executer/exfield.c index 65520b651ca4..64cfc71d618f 100644 --- a/source/components/executer/exfield.c +++ b/source/components/executer/exfield.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXFIELD_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c index e35559fffa5e..2387e17cf5b6 100644 --- a/source/components/executer/exfldio.c +++ b/source/components/executer/exfldio.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXFLDIO_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exmisc.c b/source/components/executer/exmisc.c index bca0594e53da..bdca576176bf 100644 --- a/source/components/executer/exmisc.c +++ b/source/components/executer/exmisc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXMISC_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exmutex.c b/source/components/executer/exmutex.c index c3eb25f36013..b0bca555b790 100644 --- a/source/components/executer/exmutex.c +++ b/source/components/executer/exmutex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXMUTEX_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exnames.c b/source/components/executer/exnames.c index 70c0a6d94f43..0b6db43893d7 100644 --- a/source/components/executer/exnames.c +++ b/source/components/executer/exnames.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXNAMES_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exoparg1.c b/source/components/executer/exoparg1.c index 3c38740e6924..3b6e94c0766c 100644 --- a/source/components/executer/exoparg1.c +++ b/source/components/executer/exoparg1.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXOPARG1_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c index f3e976ce536f..eea4d8ec55d6 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXOPARG2_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/executer/exoparg3.c b/source/components/executer/exoparg3.c index 0168d721f5d3..5a6045ea0f19 100644 --- a/source/components/executer/exoparg3.c +++ b/source/components/executer/exoparg3.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXOPARG3_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exoparg6.c b/source/components/executer/exoparg6.c index 148db36fb7f7..f560e73ae3cc 100644 --- a/source/components/executer/exoparg6.c +++ b/source/components/executer/exoparg6.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXOPARG6_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c index 89dcd041cf9c..a157208f7570 100644 --- a/source/components/executer/exprep.c +++ b/source/components/executer/exprep.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXPREP_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exregion.c b/source/components/executer/exregion.c index 7532630a232a..fe9df6ed8c68 100644 --- a/source/components/executer/exregion.c +++ b/source/components/executer/exregion.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXREGION_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exresnte.c b/source/components/executer/exresnte.c index 82f5dc3f8a21..0589dd65198c 100644 --- a/source/components/executer/exresnte.c +++ b/source/components/executer/exresnte.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXRESNTE_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/executer/exresolv.c b/source/components/executer/exresolv.c index 0ce9da81d288..287b6f68c1fa 100644 --- a/source/components/executer/exresolv.c +++ b/source/components/executer/exresolv.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXRESOLV_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/executer/exresop.c b/source/components/executer/exresop.c index 01057c08b398..801292163fe0 100644 --- a/source/components/executer/exresop.c +++ b/source/components/executer/exresop.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXRESOP_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/executer/exstore.c b/source/components/executer/exstore.c index 27b49d1126ac..4c6554927b0c 100644 --- a/source/components/executer/exstore.c +++ b/source/components/executer/exstore.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXSTORE_C__ - #include "acpi.h" #include "accommon.h" #include "acdispat.h" diff --git a/source/components/executer/exstoren.c b/source/components/executer/exstoren.c index df8f5fded2b9..bc7a3c9c79b9 100644 --- a/source/components/executer/exstoren.c +++ b/source/components/executer/exstoren.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXSTOREN_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exstorob.c b/source/components/executer/exstorob.c index 30304e37e9fb..036d0c096418 100644 --- a/source/components/executer/exstorob.c +++ b/source/components/executer/exstorob.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXSTOROB_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exsystem.c b/source/components/executer/exsystem.c index 09a470ecedb8..5e7ec092a74f 100644 --- a/source/components/executer/exsystem.c +++ b/source/components/executer/exsystem.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXSYSTEM_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/executer/exutils.c b/source/components/executer/exutils.c index dcc889d221b8..0c00884ae931 100644 --- a/source/components/executer/exutils.c +++ b/source/components/executer/exutils.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __EXUTILS_C__ - /* * DEFINE_AML_GLOBALS is tested in amlcode.h * to determine whether certain global names should be "defined" or only diff --git a/source/components/hardware/hwacpi.c b/source/components/hardware/hwacpi.c index feedc15c095d..7e0a5042aba6 100644 --- a/source/components/hardware/hwacpi.c +++ b/source/components/hardware/hwacpi.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __HWACPI_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/hardware/hwpci.c b/source/components/hardware/hwpci.c index 86017ed4d47a..34720c17e73a 100644 --- a/source/components/hardware/hwpci.c +++ b/source/components/hardware/hwpci.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __HWPCI_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/hardware/hwregs.c b/source/components/hardware/hwregs.c index 94c508a84ce1..b22775f75fb4 100644 --- a/source/components/hardware/hwregs.c +++ b/source/components/hardware/hwregs.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __HWREGS_C__ - #include "acpi.h" #include "accommon.h" #include "acevents.h" diff --git a/source/components/hardware/hwvalid.c b/source/components/hardware/hwvalid.c index c644076ad208..f630654fba79 100644 --- a/source/components/hardware/hwvalid.c +++ b/source/components/hardware/hwvalid.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __HWVALID_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c index 6c04c7a90324..bc030878daa1 100644 --- a/source/components/namespace/nsaccess.c +++ b/source/components/namespace/nsaccess.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSACCESS_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/namespace/nsalloc.c b/source/components/namespace/nsalloc.c index d465a37e5b8b..5391753c734f 100644 --- a/source/components/namespace/nsalloc.c +++ b/source/components/namespace/nsalloc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSALLOC_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsconvert.c b/source/components/namespace/nsconvert.c index 4c8b12db1dd3..5403f66f9125 100644 --- a/source/components/namespace/nsconvert.c +++ b/source/components/namespace/nsconvert.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSCONVERT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsdump.c b/source/components/namespace/nsdump.c index 2801adccfbac..e664c2d8fe33 100644 --- a/source/components/namespace/nsdump.c +++ b/source/components/namespace/nsdump.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSDUMP_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsdumpdv.c b/source/components/namespace/nsdumpdv.c index fe4bdad43795..f7d6408ac534 100644 --- a/source/components/namespace/nsdumpdv.c +++ b/source/components/namespace/nsdumpdv.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSDUMPDV_C__ - #include "acpi.h" diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c index 8324dba2a86b..06550ac8b6e5 100644 --- a/source/components/namespace/nseval.c +++ b/source/components/namespace/nseval.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSEVAL_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/namespace/nsinit.c b/source/components/namespace/nsinit.c index 53155977f39f..150bcc0f3290 100644 --- a/source/components/namespace/nsinit.c +++ b/source/components/namespace/nsinit.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSXFINIT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsload.c b/source/components/namespace/nsload.c index e769c2013ebf..a590c94bacf4 100644 --- a/source/components/namespace/nsload.c +++ b/source/components/namespace/nsload.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSLOAD_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c index e22f961c1984..e7e68b021ba4 100644 --- a/source/components/namespace/nsnames.c +++ b/source/components/namespace/nsnames.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSNAMES_C__ - #include "acpi.h" #include "accommon.h" #include "amlcode.h" diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c index 5247ca61b41b..74628b9cc847 100644 --- a/source/components/namespace/nsobject.c +++ b/source/components/namespace/nsobject.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSOBJECT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c index c5c7e0233dbf..9c2845dda681 100644 --- a/source/components/namespace/nsparse.c +++ b/source/components/namespace/nsparse.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSPARSE_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsrepair.c b/source/components/namespace/nsrepair.c index 3b659a91c7a2..59e170497e9d 100644 --- a/source/components/namespace/nsrepair.c +++ b/source/components/namespace/nsrepair.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSREPAIR_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsrepair2.c b/source/components/namespace/nsrepair2.c index cb6ce06c690e..7dd9649a7df8 100644 --- a/source/components/namespace/nsrepair2.c +++ b/source/components/namespace/nsrepair2.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSREPAIR2_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nssearch.c b/source/components/namespace/nssearch.c index e8ac74bad2e0..711fda38c6d0 100644 --- a/source/components/namespace/nssearch.c +++ b/source/components/namespace/nssearch.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSSEARCH_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c index 54d1a18967f9..a5aff616ee54 100644 --- a/source/components/namespace/nsutils.c +++ b/source/components/namespace/nsutils.c @@ -42,8 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSUTILS_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nswalk.c b/source/components/namespace/nswalk.c index 147e4ce816c7..1db8355cf141 100644 --- a/source/components/namespace/nswalk.c +++ b/source/components/namespace/nswalk.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSWALK_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/namespace/nsxfeval.c b/source/components/namespace/nsxfeval.c index 2b2663cabb56..907af2894afe 100644 --- a/source/components/namespace/nsxfeval.c +++ b/source/components/namespace/nsxfeval.c @@ -42,7 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSXFEVAL_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c index 48e2fa8fd4e9..9d06fe6d5541 100644 --- a/source/components/namespace/nsxfname.c +++ b/source/components/namespace/nsxfname.c @@ -42,7 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSXFNAME_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c index 69b656e12620..aa7a60417fbb 100644 --- a/source/components/namespace/nsxfobj.c +++ b/source/components/namespace/nsxfobj.c @@ -42,7 +42,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __NSXFOBJ_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c index c1bc15a6818e..17e99fa85492 100644 --- a/source/components/parser/psargs.c +++ b/source/components/parser/psargs.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __PSARGS_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/parser/pstree.c b/source/components/parser/pstree.c index 746d5759f53b..f53a0a0ad567 100644 --- a/source/components/parser/pstree.c +++ b/source/components/parser/pstree.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __PSTREE_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/parser/psxface.c b/source/components/parser/psxface.c index 2068a86a172a..6e0502d858fc 100644 --- a/source/components/parser/psxface.c +++ b/source/components/parser/psxface.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __PSXFACE_C__ - #include "acpi.h" #include "accommon.h" #include "acparser.h" diff --git a/source/components/resources/rsaddr.c b/source/components/resources/rsaddr.c index 690196240aee..f80a4adf29db 100644 --- a/source/components/resources/rsaddr.c +++ b/source/components/resources/rsaddr.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSADDR_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rscalc.c b/source/components/resources/rscalc.c index 0e9862dcf330..9bcd46f27f1b 100644 --- a/source/components/resources/rscalc.c +++ b/source/components/resources/rscalc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSCALC_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rscreate.c b/source/components/resources/rscreate.c index bac2f88f57f4..dd40ea33e8af 100644 --- a/source/components/resources/rscreate.c +++ b/source/components/resources/rscreate.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSCREATE_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsdump.c b/source/components/resources/rsdump.c index b83d05849afc..9a5d41c8f27f 100644 --- a/source/components/resources/rsdump.c +++ b/source/components/resources/rsdump.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSDUMP_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsdumpinfo.c b/source/components/resources/rsdumpinfo.c index 906544ad86b8..405a89b97acd 100644 --- a/source/components/resources/rsdumpinfo.c +++ b/source/components/resources/rsdumpinfo.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSDUMPINFO_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsinfo.c b/source/components/resources/rsinfo.c index 25fab81b014f..b0c4a78e08e4 100644 --- a/source/components/resources/rsinfo.c +++ b/source/components/resources/rsinfo.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSINFO_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsio.c b/source/components/resources/rsio.c index 9a6a75e1315f..a350635d11b0 100644 --- a/source/components/resources/rsio.c +++ b/source/components/resources/rsio.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSIO_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsirq.c b/source/components/resources/rsirq.c index 33da524238b9..481a65344310 100644 --- a/source/components/resources/rsirq.c +++ b/source/components/resources/rsirq.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSIRQ_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rslist.c b/source/components/resources/rslist.c index 639f7ee9736f..2e24a6d47f3d 100644 --- a/source/components/resources/rslist.c +++ b/source/components/resources/rslist.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSLIST_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsmemory.c b/source/components/resources/rsmemory.c index 6f0b92bf0031..d1b3512206cb 100644 --- a/source/components/resources/rsmemory.c +++ b/source/components/resources/rsmemory.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSMEMORY_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsmisc.c b/source/components/resources/rsmisc.c index af653035acb4..d9bd73b4f57f 100644 --- a/source/components/resources/rsmisc.c +++ b/source/components/resources/rsmisc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSMISC_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsserial.c b/source/components/resources/rsserial.c index 965c4b481fc8..08c9a07ffb9e 100644 --- a/source/components/resources/rsserial.c +++ b/source/components/resources/rsserial.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSIRQ_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" diff --git a/source/components/resources/rsutils.c b/source/components/resources/rsutils.c index b010ea031f0c..e99fca0bee23 100644 --- a/source/components/resources/rsutils.c +++ b/source/components/resources/rsutils.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSUTILS_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/resources/rsxface.c b/source/components/resources/rsxface.c index 1e15f8dd848b..e3d70e2eee46 100644 --- a/source/components/resources/rsxface.c +++ b/source/components/resources/rsxface.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __RSXFACE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c index e0c5f3ae4bb1..7ee5b00a14ad 100644 --- a/source/components/tables/tbdata.c +++ b/source/components/tables/tbdata.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBDATA_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c index 22c09d22bd9a..474dd4bb3f45 100644 --- a/source/components/tables/tbfadt.c +++ b/source/components/tables/tbfadt.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBFADT_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/tables/tbfind.c b/source/components/tables/tbfind.c index bbd8523e4059..12f3b265ddcc 100644 --- a/source/components/tables/tbfind.c +++ b/source/components/tables/tbfind.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBFIND_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c index 791979ccd945..10a79c3c356a 100644 --- a/source/components/tables/tbinstal.c +++ b/source/components/tables/tbinstal.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBINSTAL_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/tables/tbprint.c b/source/components/tables/tbprint.c index 431747672dcd..be5dcabf9c0c 100644 --- a/source/components/tables/tbprint.c +++ b/source/components/tables/tbprint.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBPRINT_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c index 56fd46dfca3c..628b2b72b2c3 100644 --- a/source/components/tables/tbutils.c +++ b/source/components/tables/tbutils.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBUTILS_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c index 26ee44bd9ed4..870b4bbe7aa8 100644 --- a/source/components/tables/tbxface.c +++ b/source/components/tables/tbxface.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBXFACE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c index f28aa091bfc0..bd8bafa75d0c 100644 --- a/source/components/tables/tbxfload.c +++ b/source/components/tables/tbxfload.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBXFLOAD_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c index 04500aae02fa..9b915700b2fa 100644 --- a/source/components/tables/tbxfroot.c +++ b/source/components/tables/tbxfroot.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __TBXFROOT_C__ - #include "acpi.h" #include "accommon.h" #include "actables.h" diff --git a/source/components/utilities/utaddress.c b/source/components/utilities/utaddress.c index 8de363efa136..05b011c70e57 100644 --- a/source/components/utilities/utaddress.c +++ b/source/components/utilities/utaddress.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTADDRESS_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utalloc.c b/source/components/utilities/utalloc.c index c6c29e996667..0a58bca7bdb4 100644 --- a/source/components/utilities/utalloc.c +++ b/source/components/utilities/utalloc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTALLOC_C__ - #include "acpi.h" #include "accommon.h" #include "acdebug.h" diff --git a/source/components/utilities/utbuffer.c b/source/components/utilities/utbuffer.c index a946aabbe866..95f005a4541a 100644 --- a/source/components/utilities/utbuffer.c +++ b/source/components/utilities/utbuffer.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTBUFFER_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utcache.c b/source/components/utilities/utcache.c index 51b8bde0b45c..182868fb82c8 100644 --- a/source/components/utilities/utcache.c +++ b/source/components/utilities/utcache.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTCACHE_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index 7fbcaee9351f..9d47d3a70702 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __CMCLIB_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utcopy.c b/source/components/utilities/utcopy.c index 6ab870924a29..eae39ebfdd7f 100644 --- a/source/components/utilities/utcopy.c +++ b/source/components/utilities/utcopy.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTCOPY_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c index 973d4ec66cb1..948dacc4a4dd 100644 --- a/source/components/utilities/utdebug.c +++ b/source/components/utilities/utdebug.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDEBUG_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/utilities/utdecode.c b/source/components/utilities/utdecode.c index 1666a36b254f..d6964803e211 100644 --- a/source/components/utilities/utdecode.c +++ b/source/components/utilities/utdecode.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDECODE_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c index 9e4c79b95ac3..bd30caccd5a3 100644 --- a/source/components/utilities/utdelete.c +++ b/source/components/utilities/utdelete.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDELETE_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/utilities/uterror.c b/source/components/utilities/uterror.c index e08552049d14..3f123505356f 100644 --- a/source/components/utilities/uterror.c +++ b/source/components/utilities/uterror.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTERROR_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/uteval.c b/source/components/utilities/uteval.c index afa0a267cf07..affbdd686e85 100644 --- a/source/components/utilities/uteval.c +++ b/source/components/utilities/uteval.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTEVAL_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utexcep.c b/source/components/utilities/utexcep.c index 550719cfe145..5092512a1031 100644 --- a/source/components/utilities/utexcep.c +++ b/source/components/utilities/utexcep.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTEXCEP_C__ #define EXPORT_ACPI_INTERFACES #define ACPI_DEFINE_EXCEPTION_TABLE diff --git a/source/components/utilities/utglobal.c b/source/components/utilities/utglobal.c index 3504348d4ee2..f55c15816d1d 100644 --- a/source/components/utilities/utglobal.c +++ b/source/components/utilities/utglobal.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTGLOBAL_C__ #define EXPORT_ACPI_INTERFACES #define DEFINE_ACPI_GLOBALS diff --git a/source/components/utilities/uthex.c b/source/components/utilities/uthex.c index e71cacdbc96c..d2e147d75b41 100644 --- a/source/components/utilities/uthex.c +++ b/source/components/utilities/uthex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTHEX_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c index 70a27d0ad2a7..b39d676691d3 100644 --- a/source/components/utilities/utids.c +++ b/source/components/utilities/utids.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTIDS_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/utilities/utinit.c b/source/components/utilities/utinit.c index 8e11c516751a..14336d447f9a 100644 --- a/source/components/utilities/utinit.c +++ b/source/components/utilities/utinit.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTINIT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utlock.c b/source/components/utilities/utlock.c index 7ac315fe3e61..0c652627ad86 100644 --- a/source/components/utilities/utlock.c +++ b/source/components/utilities/utlock.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTLOCK_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utmath.c b/source/components/utilities/utmath.c index 51393353b173..af20e53dc57e 100644 --- a/source/components/utilities/utmath.c +++ b/source/components/utilities/utmath.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMATH_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index de2673c6c7d3..998c0419898e 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMISC_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utmutex.c b/source/components/utilities/utmutex.c index 8fc977a63f50..586391cdce03 100644 --- a/source/components/utilities/utmutex.c +++ b/source/components/utilities/utmutex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMUTEX_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c index 263ba59caf89..84e0546b41a4 100644 --- a/source/components/utilities/utobject.c +++ b/source/components/utilities/utobject.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOBJECT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utosi.c b/source/components/utilities/utosi.c index 286fe67a6e31..93ebc73257d3 100644 --- a/source/components/utilities/utosi.c +++ b/source/components/utilities/utosi.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOSI_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utownerid.c b/source/components/utilities/utownerid.c index 91943501241d..c4681d27c314 100644 --- a/source/components/utilities/utownerid.c +++ b/source/components/utilities/utownerid.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOWNERID_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utpredef.c b/source/components/utilities/utpredef.c index d8442f6898ca..fd7d2fe11871 100644 --- a/source/components/utilities/utpredef.c +++ b/source/components/utilities/utpredef.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTPREDEF_C__ - #include "acpi.h" #include "accommon.h" #include "acpredef.h" diff --git a/source/components/utilities/utresrc.c b/source/components/utilities/utresrc.c index af077aec8215..f6fc8b90cd92 100644 --- a/source/components/utilities/utresrc.c +++ b/source/components/utilities/utresrc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTRESRC_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" @@ -300,7 +298,7 @@ const char *AcpiGbl_BpbDecode[] = const char *AcpiGbl_SbDecode[] = { - "StopBitsNone", + "StopBitsZero", "StopBitsOne", "StopBitsOnePlusHalf", "StopBitsTwo" diff --git a/source/components/utilities/utstate.c b/source/components/utilities/utstate.c index 12de2731932f..bb178016f5e8 100644 --- a/source/components/utilities/utstate.c +++ b/source/components/utilities/utstate.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTSTATE_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utstring.c b/source/components/utilities/utstring.c index 2fa7710725dc..225cf8635368 100644 --- a/source/components/utilities/utstring.c +++ b/source/components/utilities/utstring.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTSTRING_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/uttrack.c b/source/components/utilities/uttrack.c index ac9675846ea2..80ecc3234aec 100644 --- a/source/components/utilities/uttrack.c +++ b/source/components/utilities/uttrack.c @@ -52,8 +52,6 @@ * occurs in the body of AcpiUtFree. */ -#define __UTTRACK_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utuuid.c b/source/components/utilities/utuuid.c index ebf03231e4f8..f97fc8ec088c 100644 --- a/source/components/utilities/utuuid.c +++ b/source/components/utilities/utuuid.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTUUID_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utxface.c b/source/components/utilities/utxface.c index dedeab39b418..671622b5bca5 100644 --- a/source/components/utilities/utxface.c +++ b/source/components/utilities/utxface.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFACE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" @@ -621,7 +620,9 @@ AcpiDecodePldBuffer ( ACPI_MOVE_32_TO_32 (&Dword, &Buffer[0]); PldInfo->Revision = ACPI_PLD_GET_REVISION (&Dword); PldInfo->IgnoreColor = ACPI_PLD_GET_IGNORE_COLOR (&Dword); - PldInfo->Color = ACPI_PLD_GET_COLOR (&Dword); + PldInfo->Red = ACPI_PLD_GET_RED (&Dword); + PldInfo->Green = ACPI_PLD_GET_GREEN (&Dword); + PldInfo->Blue = ACPI_PLD_GET_BLUE (&Dword); /* Second 32-bit DWord */ diff --git a/source/components/utilities/utxferror.c b/source/components/utilities/utxferror.c index 48dd79c2c58c..db6535fa5fcd 100644 --- a/source/components/utilities/utxferror.c +++ b/source/components/utilities/utxferror.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFERROR_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c index 0f1a6c3a9a87..2dc5d2062ae4 100644 --- a/source/components/utilities/utxfinit.c +++ b/source/components/utilities/utxfinit.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFINIT_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" @@ -54,6 +53,11 @@ #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utxfinit") +/* For AcpiExec only */ +void +AeDoObjectOverrides ( + void); + /******************************************************************************* * @@ -309,6 +313,14 @@ AcpiInitializeObjects ( } } +#ifdef ACPI_EXEC_APP + /* + * This call implements the "initialization file" option for AcpiExec. + * This is the precise point that we want to perform the overrides. + */ + AeDoObjectOverrides (); +#endif + /* * Execute any module-level code that was detected during the table load * phase. Although illegal since ACPI 2.0, there are many machines that diff --git a/source/components/utilities/utxfmutex.c b/source/components/utilities/utxfmutex.c index 06245dce1bab..ac371d465787 100644 --- a/source/components/utilities/utxfmutex.c +++ b/source/components/utilities/utxfmutex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFMUTEX_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" |