d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ACPICA 20121018.

Browse Source
This commit is contained in:
Jung-uk Kim 2012-10-23 23:49:17 +00:00
commit 8ef1a33100
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=241973
192 changed files with 3663 additions and 2255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4086
sys/contrib/dev/acpica/changes.txt
View File

File diff suppressed because it is too large Load Diff

6
sys/contrib/dev/acpica/common/adfile.c
View File

@ -100,7 +100,7 @@ AdGenerateFilename (
FilenameBuf[i] = 0;
strcat (FilenameBuf, ACPI_TABLE_FILE_SUFFIX);
return FilenameBuf;
return (FilenameBuf);
}
@ -223,7 +223,7 @@ FlGenerateFilename (
strcat (NewFilename, Suffix);
}
return NewFilename;
return (NewFilename);
}
@ -332,5 +332,3 @@ FlSplitInputPathname (
*OutFilename = Filename;
return (AE_OK);
}

60
sys/contrib/dev/acpica/common/adisasm.c
View File

@ -296,7 +296,7 @@ AdAmlDisassemble (
Status = AcpiDbGetTableFromFile (Filename, &Table);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
/*
@ -311,14 +311,13 @@ AdAmlDisassemble (
/* Next external file */
ExternalFileList = ExternalFileList->Next;
continue;
}
Status = AcpiDbGetTableFromFile (ExternalFilename, &ExternalTable);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
/* Load external table for symbol resolution */
@ -330,7 +329,7 @@ AdAmlDisassemble (
{
AcpiOsPrintf ("Could not parse external ACPI tables, %s\n",
AcpiFormatException (Status));
return Status;
return (Status);
}
/*
@ -361,12 +360,12 @@ AdAmlDisassemble (
{
AcpiOsPrintf ("Could not get ACPI tables, %s\n",
AcpiFormatException (Status));
return Status;
return (Status);
}
if (!AcpiGbl_DbOpt_disasm)
{
return AE_OK;
return (AE_OK);
}
/* Obtained the local tables, just disassemble the DSDT */
@ -376,7 +375,7 @@ AdAmlDisassemble (
{
AcpiOsPrintf ("Could not get DSDT, %s\n",
AcpiFormatException (Status));
return Status;
return (Status);
}
AcpiOsPrintf ("\nDisassembly of DSDT\n");
@ -531,7 +530,14 @@ AdAmlDisassemble (
if (AcpiGbl_DbOpt_disasm)
{
/* This is the real disassembly */
AdDisplayTables (Filename, Table);
/* Dump hex table if requested (-vt) */
AcpiDmDumpDataTable (Table);
fprintf (stderr, "Disassembly completed\n");
fprintf (stderr, "ASL Output: %s - %u bytes\n",
DisasmFilename, AdGetFileSize (File));
@ -720,7 +726,7 @@ AdDisplayTables (
if (!AcpiGbl_ParseOpRoot)
{
return AE_NOT_EXIST;
return (AE_NOT_EXIST);
}
if (!AcpiGbl_DbOpt_verbose)
@ -733,15 +739,15 @@ AdDisplayTables (
if (AcpiGbl_DbOpt_verbose)
{
AcpiOsPrintf ("\n\nTable Header:\n");
AcpiUtDumpBuffer ((UINT8 *) Table, sizeof (ACPI_TABLE_HEADER),
AcpiUtDebugDumpBuffer ((UINT8 *) Table, sizeof (ACPI_TABLE_HEADER),
DB_BYTE_DISPLAY, ACPI_UINT32_MAX);
AcpiOsPrintf ("Table Body (Length 0x%X)\n", Table->Length);
AcpiUtDumpBuffer (((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)), Table->Length,
DB_BYTE_DISPLAY, ACPI_UINT32_MAX);
AcpiUtDebugDumpBuffer (((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)),
Table->Length, DB_BYTE_DISPLAY, ACPI_UINT32_MAX);
}
return AE_OK;
return (AE_OK);
}
@ -914,7 +920,7 @@ AdParseDeferredOps (
Status = AdDeferredParse (Op, Op->Named.Data, Op->Named.Length);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
return (Status);
}
break;
@ -942,7 +948,7 @@ AdParseDeferredOps (
}
fprintf (stderr, "\n");
return Status;
return (Status);
}
@ -979,7 +985,7 @@ AdGetLocalTables (
if (!NewTable)
{
fprintf (stderr, "Could not obtain RSDT\n");
return AE_NO_ACPI_TABLES;
return (AE_NO_ACPI_TABLES);
}
else
{
@ -1036,13 +1042,13 @@ AdGetLocalTables (
if (ACPI_FAILURE (Status))
{
fprintf (stderr, "Could not store DSDT\n");
return AE_NO_ACPI_TABLES;
return (AE_NO_ACPI_TABLES);
}
}
else
{
fprintf (stderr, "Could not obtain DSDT\n");
return AE_NO_ACPI_TABLES;
return (AE_NO_ACPI_TABLES);
}
#if 0
@ -1061,7 +1067,7 @@ AdGetLocalTables (
} while (NewTable);
#endif
return AE_OK;
return (AE_OK);
}
@ -1096,7 +1102,7 @@ AdParseTable (
if (!Table)
{
return AE_NOT_EXIST;
return (AE_NOT_EXIST);
}
/* Pass 1: Parse everything except control method bodies */
@ -1111,7 +1117,7 @@ AdParseTable (
AcpiGbl_ParseOpRoot = AcpiPsCreateScopeOp ();
if (!AcpiGbl_ParseOpRoot)
{
return AE_NO_MEMORY;
return (AE_NO_MEMORY);
}
/* Create and initialize a new walk state */
@ -1136,7 +1142,7 @@ AdParseTable (
Status = AcpiPsParseAml (WalkState);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
/* If LoadTable is FALSE, we are parsing the last loaded table */
@ -1151,19 +1157,19 @@ AdParseTable (
Table->Length, ACPI_TABLE_ORIGIN_ALLOCATED, &TableIndex);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
Status = AcpiTbAllocateOwnerId (TableIndex);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
if (OwnerId)
{
Status = AcpiTbGetOwnerId (TableIndex, OwnerId);
if (ACPI_FAILURE (Status))
{
return Status;
return (Status);
}
}
}
@ -1180,7 +1186,7 @@ AdParseTable (
if (External)
{
return AE_OK;
return (AE_OK);
}
/* Pass 3: Parse control methods and link their parse trees into the main parse tree */
@ -1192,7 +1198,5 @@ AdParseTable (
AcpiDmFindResources (AcpiGbl_ParseOpRoot);
fprintf (stderr, "Parsing completed\n");
return AE_OK;
return (AE_OK);
}

6
sys/contrib/dev/acpica/common/adwalk.c
View File

@ -654,8 +654,8 @@ AcpiDmLoadDescendingOp (
while (AcpiGbl_PreDefinedNames[PreDefineIndex].Name)
{
if (!ACPI_STRNCMP (Node->Name.Ascii,
AcpiGbl_PreDefinedNames[PreDefineIndex].Name, 4))
if (ACPI_COMPARE_NAME (Node->Name.Ascii,
AcpiGbl_PreDefinedNames[PreDefineIndex].Name))
{
PreDefined = TRUE;
break;
@ -1018,5 +1018,3 @@ AcpiDmInspectPossibleArgs (
return (Last);
}

1
sys/contrib/dev/acpica/common/dmextern.c
View File

@ -687,4 +687,3 @@ AcpiDmEmitExternals (
AcpiOsPrintf ("\n");
}

1
sys/contrib/dev/acpica/common/dmrestag.c
View File

@ -1050,4 +1050,3 @@ AcpiDmAddResourceToNamespace (
Node->Length = Length;
return (AE_OK);
}

15
sys/contrib/dev/acpica/common/dmtable.c
View File

@ -415,6 +415,18 @@ AcpiDmDumpDataTable (
if (AcpiUtIsAmlTable (Table))
{
if (Gbl_VerboseTemplates)
{
/* Dump the raw table data */
Length = Table->Length;
AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, Table),
Length, DB_BYTE_DISPLAY, 0);
AcpiOsPrintf (" */\n");
}
return;
}
@ -484,7 +496,8 @@ AcpiDmDumpDataTable (
AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
AcpiUtDumpBuffer2 (ACPI_CAST_PTR (UINT8, Table), Length, DB_BYTE_DISPLAY);
AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, Table),
Length, DB_BYTE_DISPLAY, 0);
}
}

4
sys/contrib/dev/acpica/common/dmtbdump.c
View File

@ -1611,8 +1611,8 @@ AcpiDmDumpMpst (
ACPI_MPST_DATA_HDR *SubTable1;
ACPI_MPST_POWER_DATA *SubTable2;
UINT16 SubtableCount;
UINT8 PowerStateCount;
UINT8 ComponentCount;
UINT32 PowerStateCount;
UINT32 ComponentCount;
/* Main table */

14
sys/contrib/dev/acpica/common/dmtbinfo.c
View File

@ -1518,10 +1518,10 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMchi[] =
ACPI_DMTABLE_INFO AcpiDmTableInfoMpst[] =
{
{ACPI_DMT_UINT16, ACPI_MPST_OFFSET (Reserved1), "Reserved", 0},
{ACPI_DMT_UINT8, ACPI_MPST_OFFSET (ChannelId), "Channel ID", 0},
{ACPI_DMT_UINT8, ACPI_MPST_OFFSET (Reserved2), "Reserved", 0},
{ACPI_DMT_UINT24, ACPI_MPST_OFFSET (Reserved1[0]), "Reserved", 0},
{ACPI_DMT_UINT16, ACPI_MPST_OFFSET (PowerNodeCount), "Power Node Count", 0},
{ACPI_DMT_UINT16, ACPI_MPST_OFFSET (Reserved2), "Reserved", 0},
ACPI_DMT_TERMINATOR
};
@ -1538,12 +1538,11 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0[] =
{ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (Reserved1), "Reserved", 0},
{ACPI_DMT_UINT16, ACPI_MPST0_OFFSET (NodeId), "Node ID", 0},
{ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (Length), "Length", DT_LENGTH},
{ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (Length), "Length", 0},
{ACPI_DMT_UINT64, ACPI_MPST0_OFFSET (RangeAddress), "Range Address", 0},
{ACPI_DMT_UINT64, ACPI_MPST0_OFFSET (RangeLength), "Range Length", 0},
{ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (NumPowerStates), "Num Power States", 0},
{ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (NumPhysicalComponents), "Num Physical Components", 0},
{ACPI_DMT_UINT16, ACPI_MPST0_OFFSET (Reserved2), "Reserved", 0},
{ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (NumPowerStates), "Num Power States", 0},
{ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (NumPhysicalComponents), "Num Physical Components", 0},
ACPI_DMT_TERMINATOR
};
@ -1569,6 +1568,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0B[] =
ACPI_DMTABLE_INFO AcpiDmTableInfoMpst1[] =
{
{ACPI_DMT_UINT16, ACPI_MPST1_OFFSET (CharacteristicsCount), "Characteristics Count", 0},
{ACPI_DMT_UINT16, ACPI_MPST1_OFFSET (Reserved), "Reserved", 0},
ACPI_DMT_TERMINATOR
};
@ -1576,7 +1576,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst1[] =
ACPI_DMTABLE_INFO AcpiDmTableInfoMpst2[] =
{
{ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (Revision), "Revision", 0},
{ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (StructureId), "Structure ID", 0},
{ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (Flags), "Flags (decoded below)", DT_FLAG},
{ACPI_DMT_FLAG0, ACPI_MPST2_FLAG_OFFSET (Flags,0), "Memory Preserved", 0},
{ACPI_DMT_FLAG1, ACPI_MPST2_FLAG_OFFSET (Flags,0), "Auto Entry", 0},

1
sys/contrib/dev/acpica/common/getopt.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: getopt

5
sys/contrib/dev/acpica/compiler/aslcodegen.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslcodegen - AML code generation
@ -446,7 +445,7 @@ CgWriteTableHeader (
/* Compiler ID */
strncpy (TableHeader.AslCompilerId, ASL_CREATOR_ID, 4);
ACPI_MOVE_NAME (TableHeader.AslCompilerId, ASL_CREATOR_ID);
/* Compiler version */
@ -589,5 +588,3 @@ CgWriteNode (
break;
}
}

11
sys/contrib/dev/acpica/compiler/aslcompile.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslcompile - top level compile module
@ -480,7 +479,7 @@ CmDoCompile (
{
UtEndEvent (Event);
CmCleanupAndExit ();
return 0;
return (0);
}
}
UtEndEvent (Event);
@ -548,7 +547,7 @@ CmDoCompile (
if (ACPI_FAILURE (Status))
{
AePrintErrorLog (ASL_FILE_STDERR);
return -1;
return (-1);
}
/* Interpret and generate all compile-time constants */
@ -589,7 +588,7 @@ CmDoCompile (
UtDisplaySummary (ASL_FILE_STDOUT);
}
UtEndEvent (FullCompile);
return 0;
return (0);
}
/*
@ -682,7 +681,7 @@ CmDoCompile (
UtEndEvent (FullCompile);
CmCleanupAndExit ();
return 0;
return (0);
ErrorExit:
UtEndEvent (FullCompile);
@ -905,5 +904,3 @@ CmCleanupAndExit (
FlDeleteFile (ASL_FILE_SOURCE_OUTPUT);
}
}

2
sys/contrib/dev/acpica/compiler/aslcompiler.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslcompiler.h - common include file for iASL
@ -1128,4 +1127,3 @@ DtCreateTemplates (
char *Signature);
#endif /* __ASLCOMPILER_H */

2
sys/contrib/dev/acpica/compiler/aslcompiler.y
View File

@ -3509,7 +3509,7 @@ OptionalXferSize
int
AslCompilerwrap(void)
{
return 1;
return (1);
}
/*! [End] no source code translation !*/

2
sys/contrib/dev/acpica/compiler/asldefine.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asldefine.h - Common defines for the iASL compiler
@ -174,4 +173,3 @@
RsCreateResourceField (Op, Name, ByteOffset, 0, 64);
#endif /* ASLDEFINE.H */

3
sys/contrib/dev/acpica/compiler/aslerror.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslerror - Error handling and statistics
@ -783,5 +782,5 @@ AslCompilererror (
Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename,
ACPI_CAST_PTR (char, CompilerMessage));
return 0;
return (0);
}

4
sys/contrib/dev/acpica/compiler/aslfiles.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslfiles - file I/O suppoert
@ -63,7 +62,6 @@ FlParseInputPathname (
#endif
/*******************************************************************************
*
* FUNCTION: AslAbort
@ -1147,5 +1145,3 @@ FlParseInputPathname (
return (AE_OK);
}
#endif

3
sys/contrib/dev/acpica/compiler/aslfold.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslfold - Constant folding
@ -334,7 +333,7 @@ OpcAmlConstantWalk (
WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
if (!WalkState)
{
return AE_NO_MEMORY;
return (AE_NO_MEMORY);
}
WalkState->NextOp = NULL;

3
sys/contrib/dev/acpica/compiler/aslglobal.h
View File

@ -1,5 +1,3 @@
/******************************************************************************
*
* Module Name: aslglobal.h - Global variable definitions
@ -254,4 +252,3 @@ ASL_EXTERN char StringBuffer2[ASL_MSG_BUFFER_SIZE];
#endif /* __ASLGLOBAL_H */

3
sys/contrib/dev/acpica/compiler/asllength.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asllength - Tree walk to determine package and opcode lengths
@ -454,5 +453,3 @@ LnAdjustLengthToRoot (
Gbl_TableLength -= LengthDelta;
}
#endif

5
sys/contrib/dev/acpica/compiler/asllisting.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asllisting - Listing file generation
@ -479,7 +478,7 @@ LsPopNode (
{
AslError (ASL_ERROR, ASL_MSG_COMPILER_INTERNAL, NULL,
"Could not pop empty listing stack");
return Gbl_ListingNode;
return (Gbl_ListingNode);
}
Gbl_ListingNode = Lnode->Next;
@ -1538,5 +1537,3 @@ LsDoHexOutputAsm (
FlPrintFile (ASL_FILE_HEX_OUTPUT, "\n");
}

6
sys/contrib/dev/acpica/compiler/aslload.c
View File

@ -113,7 +113,7 @@ LdLoadNamespace (
WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
if (!WalkState)
{
return AE_NO_MEMORY;
return (AE_NO_MEMORY);
}
/* Walk the entire parse tree, first pass */
@ -129,7 +129,7 @@ LdLoadNamespace (
/* Dump the namespace if debug is enabled */
AcpiNsDumpTables (ACPI_NS_ALL, ACPI_UINT32_MAX);
return AE_OK;
return (AE_OK);
}
@ -894,5 +894,3 @@ LdCommonNamespaceEnd (
return (AE_OK);
}

6
sys/contrib/dev/acpica/compiler/asllookup.c
View File

@ -718,14 +718,14 @@ LkCrossReferenceNamespace (
WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL);
if (!WalkState)
{
return AE_NO_MEMORY;
return (AE_NO_MEMORY);
}
/* Walk the entire parse tree */
TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE, LkNamespaceLocateBegin,
LkNamespaceLocateEnd, WalkState);
return AE_OK;
return (AE_OK);
}
@ -1397,5 +1397,3 @@ LkNamespaceLocateEnd (
return (AE_OK);
}

14
sys/contrib/dev/acpica/compiler/aslmain.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslmain - compiler main and utilities
@ -124,6 +123,7 @@ Options (
printf ("\nGlobal:\n");
ACPI_OPTION ("-@ <file>", "Specify command file");
ACPI_OPTION ("-I <dir>", "Specify additional include directory");
ACPI_OPTION ("-T <sig>|ALL|*", "Create table template file for ACPI <Sig>");
ACPI_OPTION ("-v", "Display compiler version");
printf ("\nPreprocessor:\n");
@ -142,10 +142,10 @@ Options (
ACPI_OPTION ("-w1 -w2 -w3", "Set warning reporting level");
ACPI_OPTION ("-we", "Report warnings as errors");
printf ("\nAML Output Files:\n");
ACPI_OPTION ("-sa -sc", "Create AML in assembler or C source file (*.asm or *.c)");
printf ("\nAML and Data Output Files:\n");
ACPI_OPTION ("-sa -sc", "Create assembler or C source file (*.asm or *.c)");
ACPI_OPTION ("-ia -ic", "Create assembler or C include file (*.inc or *.h)");
ACPI_OPTION ("-ta -tc -ts", "Create AML in assembler, C, or ASL hex table (*.hex)");
ACPI_OPTION ("-ta -tc -ts", "Create assembler, C, or ASL hex table (*.hex)");
printf ("\nAML Code Generation:\n");
ACPI_OPTION ("-oa", "Disable all optimizations (compatibility mode)");
@ -162,7 +162,6 @@ Options (
printf ("\nACPI Data Tables:\n");
ACPI_OPTION ("-G", "Compile custom table containing generic operators");
ACPI_OPTION ("-T <sig>|ALL|*", "Create table template file(s) for <Sig>");
ACPI_OPTION ("-vt", "Create verbose templates (full disassembly)");
printf ("\nAML Disassembler:\n");
@ -174,6 +173,7 @@ Options (
ACPI_OPTION ("-e [f1,f2]", "Include ACPI table(s) for external symbol resolution");
ACPI_OPTION ("-2", "Emit ACPI 2.0 compatible ASL code");
ACPI_OPTION ("-g", "Get ACPI tables and write to files (*.dat)");
ACPI_OPTION ("-vt", "Dump binary table data in hex format within output file");
printf ("\nHelp:\n");
ACPI_OPTION ("-h", "This message");
@ -389,7 +389,7 @@ AslDoResponseFile (
{
printf ("Could not open command file %s, %s\n",
Filename, strerror (errno));
return -1;
return (-1);
}
/* Must save the current GetOpt globals */
@ -1070,5 +1070,3 @@ main (
return (0);
}

3
sys/contrib/dev/acpica/compiler/aslmap.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslmap - parser to AML opcode mapping table
@ -451,5 +450,3 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] =
/*! [End] no source code translation !*/
};

1
sys/contrib/dev/acpica/compiler/aslmessages.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslmessages.h - Compiler error/warning messages

25
sys/contrib/dev/acpica/compiler/aslopcodes.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslopcode - AML opcode generation
@ -211,7 +210,7 @@ OpcSetOptimalIntegerSize (
Op->Asl.Parent->Asl.Parent &&
(Op->Asl.Parent->Asl.Parent->Asl.ParseOpcode == PARSEOP_DEFINITIONBLOCK))
{
return 0;
return (0);
}
#endif
@ -231,14 +230,14 @@ OpcSetOptimalIntegerSize (
Op->Asl.AmlOpcode = AML_ZERO_OP;
AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION,
Op, "Zero");
return 1;
return (1);
case 1:
Op->Asl.AmlOpcode = AML_ONE_OP;
AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION,
Op, "One");
return 1;
return (1);
case ACPI_UINT32_MAX:
@ -249,7 +248,7 @@ OpcSetOptimalIntegerSize (
Op->Asl.AmlOpcode = AML_ONES_OP;
AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION,
Op, "Ones");
return 1;
return (1);
}
break;
@ -262,7 +261,7 @@ OpcSetOptimalIntegerSize (
Op->Asl.AmlOpcode = AML_ONES_OP;
AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION,
Op, "Ones");
return 1;
return (1);
}
break;
@ -276,17 +275,17 @@ OpcSetOptimalIntegerSize (
if (Op->Asl.Value.Integer <= ACPI_UINT8_MAX)
{
Op->Asl.AmlOpcode = AML_BYTE_OP;
return 1;
return (1);
}
if (Op->Asl.Value.Integer <= ACPI_UINT16_MAX)
{
Op->Asl.AmlOpcode = AML_WORD_OP;
return 2;
return (2);
}
if (Op->Asl.Value.Integer <= ACPI_UINT32_MAX)
{
Op->Asl.AmlOpcode = AML_DWORD_OP;
return 4;
return (4);
}
else
{
@ -299,12 +298,12 @@ OpcSetOptimalIntegerSize (
{
/* Truncate the integer to 32-bit */
Op->Asl.AmlOpcode = AML_DWORD_OP;
return 4;
return (4);
}
}
Op->Asl.AmlOpcode = AML_QWORD_OP;
return 8;
return (8);
}
}
@ -547,7 +546,7 @@ OpcDoUnicode (
* values as follows:
* 1) Find hex ASCII value for each letter
* 2) Subtract 40h from each ASCII value
* 3) Retain 5 least signficant bits for each letter by
* 3) Retain 5 least significant bits for each letter by
* discarding upper 3 bits because they are always 0.
* 4) Compressed code = concatenate 0 and the 3 5-bit values
*
@ -810,5 +809,3 @@ OpcGenerateAmlOpcode (
return;
}

3
sys/contrib/dev/acpica/compiler/asloperands.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asloperands - AML operand processing
@ -1184,5 +1183,3 @@ OpnGenerateAmlOperands (
OpnAttachNameToNode (Op);
}

12
sys/contrib/dev/acpica/compiler/aslopt.c
View File

@ -254,12 +254,11 @@ OptBuildShortestPath (
{
/* Compare two single NameSegs */
if (ACPI_STRNCMP (
&((char *) TargetPath->Pointer)[(NumCommonSegments *
ACPI_PATH_SEGMENT_LENGTH) + 1],
&((char *) CurrentPath->Pointer)[(NumCommonSegments *
ACPI_PATH_SEGMENT_LENGTH) + 1],
ACPI_NAME_SIZE))
if (!ACPI_COMPARE_NAME (
&((char *) TargetPath->Pointer)[
(NumCommonSegments * ACPI_PATH_SEGMENT_LENGTH) + 1],
&((char *) CurrentPath->Pointer)[
(NumCommonSegments * ACPI_PATH_SEGMENT_LENGTH) + 1]))
{
/* Mismatch */
@ -803,4 +802,3 @@ OptOptimizeNamePath (
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "\n"));
return_VOID;
}

7
sys/contrib/dev/acpica/compiler/aslresource.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslresource - Resource template/descriptor utilities
@ -398,7 +397,7 @@ RsGetStringDataLength (
InitializerOp = ASL_GET_PEER_NODE (InitializerOp);
}
return 0;
return (0);
}
@ -929,7 +928,7 @@ RsLinkDescriptorChain (
if (!Rnode)
{
return 0;
return (0);
}
/* Point the previous node to the new node */
@ -949,7 +948,7 @@ RsLinkDescriptorChain (
/* Previous node becomes the last node in the chain */
*PreviousRnode = LastRnode;
return CurrentByteOffset;
return (CurrentByteOffset);
}

2
sys/contrib/dev/acpica/compiler/aslrestype1.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype1 - Miscellaneous small resource descriptors
@ -650,4 +649,3 @@ RsDoVendorSmallDescriptor (
Descriptor->VendorSmall.DescriptorType |= (UINT8) i;
return (Rnode);
}

1
sys/contrib/dev/acpica/compiler/aslrestype1i.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype1i - Small I/O-related resource descriptors

1
sys/contrib/dev/acpica/compiler/aslrestype2d.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype2d - Large DWord address resource descriptors

1
sys/contrib/dev/acpica/compiler/aslrestype2e.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype2e - Large Extended address resource descriptors

1
sys/contrib/dev/acpica/compiler/aslrestype2q.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype2q - Large QWord address resource descriptors

1
sys/contrib/dev/acpica/compiler/aslrestype2w.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslrestype2w - Large Word address resource descriptors

5
sys/contrib/dev/acpica/compiler/aslstartup.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslstartup - Compiler startup routines, called from main
@ -231,9 +230,13 @@ AslDetectSourceFileType (
if (ACPI_FAILURE (Status))
{
printf ("Non-ascii input file - %s\n", Info->Filename);
if (!Gbl_IgnoreErrors)
{
Type = ASL_INPUT_TYPE_BINARY;
goto Cleanup;
}
}
/*
* File is ASCII. Determine if this is an ASL file or an ACPI data

3
sys/contrib/dev/acpica/compiler/aslstubs.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslstubs - Stubs used to link to Aml interpreter
@ -62,7 +61,7 @@ ACPI_PHYSICAL_ADDRESS
AeLocalGetRootPointer (
void)
{
return 0;
return (0);
}
void

1
sys/contrib/dev/acpica/compiler/aslsupport.l
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslsupport.l - Flex/lex scanner C support routines.

3
sys/contrib/dev/acpica/compiler/asltransform.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asltransform - Parse tree transforms
@ -778,5 +777,3 @@ TrDoSwitch (
BreakOp->Asl.Parent = StartNode;
TrAmlInsertPeer (Conditional, BreakOp);
}

37
sys/contrib/dev/acpica/compiler/asltree.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asltree - parse tree management
@ -121,7 +120,7 @@ TrAllocateNode (
Op->Asl.Column = Gbl_CurrentColumn;
UtSetParseOpName (Op);
return Op;
return (Op);
}
@ -171,7 +170,7 @@ TrUpdateNode (
if (!Op)
{
return NULL;
return (NULL);
}
DbgPrint (ASL_PARSE_OUTPUT,
@ -234,7 +233,7 @@ TrUpdateNode (
break;
}
return Op;
return (Op);
}
@ -336,7 +335,7 @@ TrSetNodeFlags (
if (!Op)
{
return NULL;
return (NULL);
}
Op->Asl.CompileFlags |= Flags;
@ -370,7 +369,7 @@ TrSetNodeAmlLength (
if (!Op)
{
return NULL;
return (NULL);
}
Op->Asl.AmlLength = Length;
@ -434,7 +433,7 @@ TrCreateLeafNode (
"\nCreateLeafNode Ln/Col %u/%u NewNode %p Op %s\n\n",
Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode));
return Op;
return (Op);
}
@ -580,7 +579,7 @@ TrCreateValuedLeafNode (
}
DbgPrint (ASL_PARSE_OUTPUT, "\n\n");
return Op;
return (Op);
}
@ -702,7 +701,7 @@ TrCreateNode (
va_end(ap);
DbgPrint (ASL_PARSE_OUTPUT, "\n\n");
return Op;
return (Op);
}
@ -776,7 +775,7 @@ TrLinkChildren (
{
AslError (ASL_WARNING, ASL_MSG_COMPILER_INTERNAL, Child,
"Child node list invalid");
return Op;
return (Op);
}
DbgPrint (ASL_PARSE_OUTPUT, "%p, ", Child);
@ -825,7 +824,7 @@ TrLinkChildren (
va_end(ap);
DbgPrint (ASL_PARSE_OUTPUT, "\n\n");
return Op;
return (Op);
}
@ -859,19 +858,19 @@ TrLinkPeerNode (
if ((!Op1) && (!Op2))
{
DbgPrint (ASL_PARSE_OUTPUT, "\nTwo Null nodes!\n");
return Op1;
return (Op1);
}
/* If one of the nodes is null, just return the non-null node */
if (!Op2)
{
return Op1;
return (Op1);
}
if (!Op1)
{
return Op2;
return (Op2);
}
if (Op1 == Op2)
@ -881,7 +880,7 @@ TrLinkPeerNode (
Op1);
AslError (ASL_WARNING, ASL_MSG_COMPILER_INTERNAL, Op1,
"Linking node to itself");
return Op1;
return (Op1);
}
Op1->Asl.Parent = Op2->Asl.Parent;
@ -898,7 +897,7 @@ TrLinkPeerNode (
}
Next->Asl.Next = Op2;
return Op1;
return (Op1);
}
@ -994,7 +993,7 @@ TrLinkChildNode (
if (!Op1 || !Op2)
{
return Op1;
return (Op1);
}
Op1->Asl.Child = Op2;
@ -1008,7 +1007,7 @@ TrLinkChildNode (
Next = Next->Asl.Next;
}
return Op1;
return (Op1);
}
@ -1236,5 +1235,3 @@ TrWalkParseTree (
return (AE_OK);
}

1
sys/contrib/dev/acpica/compiler/asltypes.h
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: asltypes.h - compiler data types and struct definitions

8
sys/contrib/dev/acpica/compiler/aslutils.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: aslutils -- compiler utilities
@ -54,7 +53,6 @@
ACPI_MODULE_NAME ("aslutils")
/* Local prototypes */
static void
@ -569,7 +567,7 @@ UtCheckIntegerRange (
if (!Op)
{
return NULL;
return (NULL);
}
if ((Op->Asl.Value.Integer < LowValue) ||
@ -833,12 +831,12 @@ UtAttachNameseg (
Name++;
}
/* Remaing string should be one single nameseg */
/* Remaining string should be one single nameseg */
UtPadNameWithUnderscores (Name, PaddedNameSeg);
}
strncpy (Op->Asl.NameSeg, PaddedNameSeg, 4);
ACPI_MOVE_NAME (Op->Asl.NameSeg, PaddedNameSeg);
}

2
sys/contrib/dev/acpica/compiler/aslwalks.c
View File

@ -566,7 +566,7 @@ AnMethodAnalysisWalkEnd (
/*
* If there is a peer node after the return statement, then this
* node is unreachable code -- i.e., it won't be executed because of
* the preceeding Return() statement.
* the preceding Return() statement.
*/
if (Op->Asl.Next)
{

2
sys/contrib/dev/acpica/compiler/dtcompile.c
View File

@ -109,7 +109,7 @@ DtDoCompile (
if (Gbl_PreprocessOnly)
{
return AE_OK;
return (AE_OK);
}
/*

4
sys/contrib/dev/acpica/compiler/dtio.c
View File

@ -577,7 +577,7 @@ DtGetNextLine (
break;
default: /* Not a comment */
i++; /* Save the preceeding slash */
i++; /* Save the preceding slash */
if (i >= Gbl_LineBufferSize)
{
UtExpandLineBuffers ();
@ -1008,7 +1008,7 @@ DtWriteTableToListing (
AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Gbl_TableLength, Gbl_TableLength);
AcpiUtDumpBuffer2 (Buffer, Gbl_TableLength, DB_BYTE_DISPLAY);
AcpiUtDumpBuffer (Buffer, Gbl_TableLength, DB_BYTE_DISPLAY, 0);
AcpiOsRedirectOutput (stdout);
}

6
sys/contrib/dev/acpica/compiler/dttable.c
View File

@ -872,7 +872,7 @@ DtCompileHest (
}
}
return AE_OK;
return (AE_OK);
}
@ -1184,8 +1184,8 @@ DtCompileMpst (
ACPI_MPST_POWER_NODE *MpstPowerNode;
ACPI_MPST_DATA_HDR *MpstDataHeader;
UINT16 SubtableCount;
UINT8 PowerStateCount;
UINT8 ComponentCount;
UINT32 PowerStateCount;
UINT32 ComponentCount;
/* Main table */

25
sys/contrib/dev/acpica/compiler/dttemplate.h
View File

@ -539,20 +539,29 @@ const unsigned char TemplateMchi[] =
const unsigned char TemplateMpst[] =
{
0x4D,0x50,0x53,0x54,0x6E,0x00,0x00,0x00, /* 00000000 "MPSTn..." */
0x01,0x98,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */
0x4D,0x50,0x53,0x54,0xB6,0x00,0x00,0x00, /* 00000000 "MPST...." */
0x01,0x77,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 ".wINTEL " */
0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */
0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
0x04,0x08,0x11,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */
0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */
0x13,0x09,0x12,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */
0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */
0x00,0x00,0x02,0x03,0x00,0x00,0x00,0x00, /* 00000040 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */
0x01,0x00,0x41,0x00,0x00,0x00,0x00,0x00, /* 00000050 "..A....." */
0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000040 "........" */
0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */
0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, /* 00000050 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000058 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000060 "........" */
0x00,0x00,0x00,0x00,0x00,0x00 /* 00000068 "......" */
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00, /* 00000068 "........" */
0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */
0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00, /* 00000078 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000088 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000090 "........" */
0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000098 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A0 "........" */
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A8 "........" */
0x00,0x00,0x00,0x00,0x00,0x00 /* 000000B0 "......" */
};
const unsigned char TemplateMsct[] =

6
sys/contrib/dev/acpica/components/debugger/dbcmds.c
View File

@ -194,13 +194,13 @@ AcpiDbSleep (
goto ErrorExit;
}
return (Status);
return_ACPI_STATUS (Status);
ErrorExit:
ACPI_EXCEPTION ((AE_INFO, Status, "During sleep test"));
return (Status);
return_ACPI_STATUS (Status);
}
@ -577,7 +577,7 @@ AcpiDbDisplayTemplate (
DumpBuffer:
AcpiOsPrintf ("\nRaw data buffer:\n");
AcpiUtDumpBuffer ((UINT8 *) Node->Object->Buffer.Pointer,
AcpiUtDebugDumpBuffer ((UINT8 *) Node->Object->Buffer.Pointer,
Node->Object->Buffer.Length,
DB_BYTE_DISPLAY, ACPI_UINT32_MAX);

39
sys/contrib/dev/acpica/components/debugger/dbdisply.c
View File

@ -270,7 +270,7 @@ AcpiDbDecodeAndDisplayObject (
return;
}
AcpiUtDumpBuffer (ObjPtr, sizeof (ACPI_OPERAND_OBJECT), Display,
AcpiUtDebugDumpBuffer (ObjPtr, sizeof (ACPI_OPERAND_OBJECT), Display,
ACPI_UINT32_MAX);
AcpiExDumpObjectDescriptor (ObjPtr, 1);
break;
@ -287,7 +287,7 @@ AcpiDbDecodeAndDisplayObject (
return;
}
AcpiUtDumpBuffer (ObjPtr, sizeof (ACPI_PARSE_OBJECT), Display,
AcpiUtDebugDumpBuffer (ObjPtr, sizeof (ACPI_PARSE_OBJECT), Display,
ACPI_UINT32_MAX);
AcpiDbDumpParserDescriptor ((ACPI_PARSE_OBJECT *) ObjPtr);
break;
@ -305,7 +305,7 @@ AcpiDbDecodeAndDisplayObject (
/* Just dump some memory */
AcpiUtDumpBuffer (ObjPtr, Size, Display, ACPI_UINT32_MAX);
AcpiUtDebugDumpBuffer (ObjPtr, Size, Display, ACPI_UINT32_MAX);
break;
}
@ -342,7 +342,7 @@ AcpiDbDecodeAndDisplayObject (
return;
}
AcpiUtDumpBuffer ((void *) Node, sizeof (ACPI_NAMESPACE_NODE),
AcpiUtDebugDumpBuffer ((void *) Node, sizeof (ACPI_NAMESPACE_NODE),
Display, ACPI_UINT32_MAX);
AcpiExDumpNamespaceNode (Node, 1);
@ -357,7 +357,7 @@ AcpiDbDecodeAndDisplayObject (
return;
}
AcpiUtDumpBuffer ((void *) ObjDesc, sizeof (ACPI_OPERAND_OBJECT),
AcpiUtDebugDumpBuffer ((void *) ObjDesc, sizeof (ACPI_OPERAND_OBJECT),
Display, ACPI_UINT32_MAX);
AcpiExDumpObjectDescriptor (ObjDesc, 1);
}
@ -643,7 +643,7 @@ AcpiDbDisplayCallingTree (
*
* FUNCTION: AcpiDbDisplayObjectType
*
* PARAMETERS: ObjectArg - User entered NS node handle
* PARAMETERS: Name - User entered NS node handle or name
*
* RETURN: None
*
@ -653,17 +653,21 @@ AcpiDbDisplayCallingTree (
void
AcpiDbDisplayObjectType (
char *ObjectArg)
char *Name)
{
ACPI_HANDLE Handle;
ACPI_NAMESPACE_NODE *Node;
ACPI_DEVICE_INFO *Info;
ACPI_STATUS Status;
UINT32 i;
Handle = ACPI_TO_POINTER (ACPI_STRTOUL (ObjectArg, NULL, 16));
Node = AcpiDbConvertToNode (Name);
if (!Node)
{
return;
}
Status = AcpiGetObjectInfo (Handle, &Info);
Status = AcpiGetObjectInfo (ACPI_CAST_PTR (ACPI_HANDLE, Node), &Info);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not get object info, %s\n",
@ -671,18 +675,25 @@ AcpiDbDisplayObjectType (
return;
}
if (Info->Valid & ACPI_VALID_ADR)
{
AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n",
ACPI_FORMAT_UINT64 (Info->Address),
Info->CurrentStatus, Info->Flags);
}
if (Info->Valid & ACPI_VALID_SXDS)
{
AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n",
Info->HighestDstates[0], Info->HighestDstates[1],
Info->HighestDstates[2], Info->HighestDstates[3]);
}
if (Info->Valid & ACPI_VALID_SXWS)
{
AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n",
Info->LowestDstates[0], Info->LowestDstates[1],
Info->LowestDstates[2], Info->LowestDstates[3],
Info->LowestDstates[4]);
}
if (Info->Valid & ACPI_VALID_HID)
{
@ -692,6 +703,10 @@ AcpiDbDisplayObjectType (
{
AcpiOsPrintf ("UID: %s\n", Info->UniqueId.String);
}
if (Info->Valid & ACPI_VALID_SUB)
{
AcpiOsPrintf ("SUB: %s\n", Info->SubsystemId.String);
}
if (Info->Valid & ACPI_VALID_CID)
{
for (i = 0; i < Info->CompatibleIdList.Count; i++)

6
sys/contrib/dev/acpica/components/debugger/dbexec.c
View File

@ -862,8 +862,8 @@ AcpiDbDumpPldBuffer (
{
AcpiOsPrintf ("Converted _PLD buffer does not compare. New:\n");
AcpiUtDumpBuffer2 (NewBuffer,
BufferDesc->Buffer.Length, DB_BYTE_DISPLAY);
AcpiUtDumpBuffer (NewBuffer,
BufferDesc->Buffer.Length, DB_BYTE_DISPLAY, 0);
}
/* First 32-bit dword */
@ -1329,5 +1329,3 @@ AcpiDbCreateExecutionThreads (
}
#endif /* ACPI_DEBUGGER */

7
sys/contrib/dev/acpica/components/debugger/dbfileio.c
View File

@ -328,9 +328,9 @@ AcpiDbReadTable (
#ifdef ACPI_OBSOLETE_CODE
/* We only support a limited number of table types */
if (ACPI_STRNCMP ((char *) TableHeader.Signature, DSDT_SIG, 4) &&
ACPI_STRNCMP ((char *) TableHeader.Signature, PSDT_SIG, 4) &&
ACPI_STRNCMP ((char *) TableHeader.Signature, SSDT_SIG, 4))
if (!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_DSDT) &&
!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_PSDT) &&
!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_SSDT))
{
AcpiOsPrintf ("Table signature [%4.4s] is invalid or not supported\n",
(char *) TableHeader.Signature);
@ -588,4 +588,3 @@ AcpiDbGetTableFromFile (
}
#endif /* ACPI_DEBUGGER */

1
sys/contrib/dev/acpica/components/debugger/dbhistry.c
View File

@ -217,4 +217,3 @@ AcpiDbGetFromHistory (
}
#endif /* ACPI_DEBUGGER */

1
sys/contrib/dev/acpica/components/debugger/dbinput.c
View File

@ -1231,4 +1231,3 @@ AcpiDbUserCommands (
}
#endif /* ACPI_DEBUGGER */

2
sys/contrib/dev/acpica/components/debugger/dbstats.c
View File

@ -314,7 +314,7 @@ AcpiDbClassifyOneObject (
AcpiGbl_NodeTypeCount [Type]++;
}
return AE_OK;
return (AE_OK);
#ifdef ACPI_FUTURE_IMPLEMENTATION

6
sys/contrib/dev/acpica/components/debugger/dbutils.c
View File

@ -204,7 +204,7 @@ AcpiDbDumpExternalObject (
{
AcpiOsPrintf ("\n");
}
AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer),
AcpiUtDebugDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer),
ObjDesc->Buffer.Length, DB_BYTE_DISPLAY, _COMPONENT);
}
else
@ -513,11 +513,9 @@ AcpiDbDumpBuffer (
AcpiOsPrintf ("\nLocation %X:\n", Address);
AcpiDbgLevel |= ACPI_LV_TABLES;
AcpiUtDumpBuffer (ACPI_TO_POINTER (Address), 64, DB_BYTE_DISPLAY,
AcpiUtDebugDumpBuffer (ACPI_TO_POINTER (Address), 64, DB_BYTE_DISPLAY,
ACPI_UINT32_MAX);
}
#endif
#endif /* ACPI_DEBUGGER */

42
sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
View File

@ -421,7 +421,7 @@ AcpiDmIsPldBuffer (
*
******************************************************************************/
#define ACPI_PLD_OUTPUT "%*.s/* %18s : %-6.2X */\n", ACPI_MUL_4 (Level), " "
#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), " "
@ -452,8 +452,8 @@ AcpiDmPldBuffer (
/* First 32-bit dword */
AcpiOsPrintf (ACPI_PLD_OUTPUT, "Revision", PldInfo->Revision);
AcpiOsPrintf (ACPI_PLD_OUTPUT, "IgnoreColor", PldInfo->IgnoreColor);
AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Revision", PldInfo->Revision);
AcpiOsPrintf (ACPI_PLD_OUTPUT08, "IgnoreColor", PldInfo->IgnoreColor);
AcpiOsPrintf (ACPI_PLD_OUTPUT24,"Color", PldInfo->Color);
/* Second 32-bit dword */
@ -463,27 +463,27 @@ AcpiDmPldBuffer (
/* 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_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);
/* 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_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);
/* Fifth 32-bit dword */

2
sys/contrib/dev/acpica/components/disassembler/dmnames.c
View File

@ -449,5 +449,3 @@ AcpiDmValidateName (
#endif
#endif

2
sys/contrib/dev/acpica/components/disassembler/dmobject.c
View File

@ -585,5 +585,3 @@ AcpiDmDisplayArguments (
}
#endif

1
sys/contrib/dev/acpica/components/disassembler/dmopcode.c
View File

@ -46,7 +46,6 @@
#include <contrib/dev/acpica/include/acparser.h>
#include <contrib/dev/acpica/include/amlcode.h>
#include <contrib/dev/acpica/include/acdisasm.h>
#include <contrib/dev/acpica/include/acnamesp.h>
#ifdef ACPI_DISASSEMBLER

1
sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
View File

@ -697,4 +697,3 @@ AcpiDmSerialBusDescriptor (
}
#endif

1
sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
View File

@ -355,4 +355,3 @@ AcpiDmVendorSmallDescriptor (
}
#endif

6
sys/contrib/dev/acpica/components/disassembler/dmutils.c
View File

@ -252,7 +252,7 @@ AcpiDmCommaIfListMember (
if (!Op->Common.Next)
{
return FALSE;
return (FALSE);
}
if (AcpiDmListType (Op->Common.Parent) & BLOCK_COMMA_LIST)
@ -270,14 +270,14 @@ AcpiDmCommaIfListMember (
*/
if (!Op->Common.Next->Common.Next)
{
return FALSE;
return (FALSE);
}
}
if ((Op->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST) &&
(!(Op->Common.Next->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST)))
{
return FALSE;
return (FALSE);
}
AcpiOsPrintf (", ");

2
sys/contrib/dev/acpica/components/dispatcher/dsfield.c
View File

@ -828,5 +828,3 @@ AcpiDsCreateIndexField (
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/dispatcher/dsinit.c
View File

@ -234,5 +234,3 @@ AcpiDsInitializeObjects (
return_ACPI_STATUS (AE_OK);
}

2
sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
View File

@ -722,5 +722,3 @@ AcpiDsTerminateControlMethod (
return_VOID;
}

2
sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
View File

@ -768,5 +768,3 @@ AcpiDsMethodDataGetType (
return_VALUE (Object->Type);
}
#endif

2
sys/contrib/dev/acpica/components/dispatcher/dsobject.c
View File

@ -863,5 +863,3 @@ AcpiDsInitObjectFromOp (
return_ACPI_STATUS (Status);
}

1
sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
View File

@ -806,4 +806,3 @@ AcpiDsEvalBankFieldOperands (
AcpiUtRemoveReference (OperandDesc);
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/dispatcher/dswexec.c
View File

@ -793,5 +793,3 @@ AcpiDsExecEndOp (
WalkState->NumOperands = 0;
return_ACPI_STATUS (Status);
}

5
sys/contrib/dev/acpica/components/dispatcher/dswload2.c
View File

@ -266,7 +266,7 @@ AcpiDsLoad2BeginOp (
"Scope operator [%4.4s] (Cannot override)",
AcpiUtGetTypeName (Node->Type), AcpiUtGetNodeName (Node)));
return (AE_AML_OPERAND_TYPE);
return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
}
break;
@ -625,7 +625,7 @@ AcpiDsLoad2EndOp (
RegionSpace, WalkState);
if (ACPI_FAILURE (Status))
{
return (Status);
return_ACPI_STATUS (Status);
}
AcpiExExitInterpreter ();
@ -758,4 +758,3 @@ AcpiDsLoad2EndOp (
WalkState->NumOperands = 0;
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/dispatcher/dswscope.c
View File

@ -235,5 +235,3 @@ AcpiDsScopeStackPop (
AcpiUtDeleteGenericState (ScopeInfo);
return_ACPI_STATUS (AE_OK);
}

6
sys/contrib/dev/acpica/components/dispatcher/dswstate.c
View File

@ -790,14 +790,14 @@ AcpiDsDeleteWalkState (
if (!WalkState)
{
return;
return_VOID;
}
if (WalkState->DescriptorType != ACPI_DESC_TYPE_WALK)
{
ACPI_ERROR ((AE_INFO, "%p is not a valid walk state",
WalkState));
return;
return_VOID;
}
/* There should not be any open scopes */
@ -842,5 +842,3 @@ AcpiDsDeleteWalkState (
ACPI_FREE (WalkState);
return_VOID;
}

2
sys/contrib/dev/acpica/components/events/evevent.c
View File

@ -332,5 +332,3 @@ AcpiEvFixedEventDispatch (
}
#endif /* !ACPI_REDUCED_HARDWARE */

5
sys/contrib/dev/acpica/components/events/evrgnini.c
View File

@ -389,8 +389,8 @@ AcpiEvIsPciRootBridge (
ACPI_NAMESPACE_NODE *Node)
{
ACPI_STATUS Status;
ACPI_DEVICE_ID *Hid;
ACPI_DEVICE_ID_LIST *Cid;
ACPI_PNP_DEVICE_ID *Hid;
ACPI_PNP_DEVICE_ID_LIST *Cid;
UINT32 i;
BOOLEAN Match;
@ -729,4 +729,3 @@ AcpiEvInitializeRegion (
return_ACPI_STATUS (AE_NOT_EXIST);
}

4
sys/contrib/dev/acpica/components/events/evxfgpe.c
View File

@ -774,7 +774,7 @@ AcpiInstallGpeBlock (
Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status))
{
return (Status);
return_ACPI_STATUS (Status);
}
Node = AcpiNsValidateHandle (GpeDevice);
@ -867,7 +867,7 @@ AcpiRemoveGpeBlock (
Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE (Status))
{
return (Status);
return_ACPI_STATUS (Status);
}
Node = AcpiNsValidateHandle (GpeDevice);

1
sys/contrib/dev/acpica/components/events/evxfregn.c
View File

@ -310,4 +310,3 @@ AcpiRemoveAddressSpaceHandler (
}
ACPI_EXPORT_SYMBOL (AcpiRemoveAddressSpaceHandler)

1
sys/contrib/dev/acpica/components/executer/exconfig.c
View File

@ -685,4 +685,3 @@ AcpiExUnloadTable (
DdbHandle->Common.Flags &= ~AOPOBJ_DATA_VALID;
return_ACPI_STATUS (AE_OK);
}

2
sys/contrib/dev/acpica/components/executer/exconvrt.c
View File

@ -750,5 +750,3 @@ AcpiExConvertToTargetType (
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/executer/excreate.c
View File

@ -570,5 +570,3 @@ AcpiExCreateMethod (
AcpiUtRemoveReference (Operand[1]);
return_ACPI_STATUS (Status);
}

8
sys/contrib/dev/acpica/components/executer/exdebug.c
View File

@ -162,9 +162,9 @@ AcpiExDoDebugObject (
case ACPI_TYPE_BUFFER:
AcpiOsPrintf ("[0x%.2X]\n", (UINT32) SourceDesc->Buffer.Length);
AcpiUtDumpBuffer2 (SourceDesc->Buffer.Pointer,
AcpiUtDumpBuffer (SourceDesc->Buffer.Pointer,
(SourceDesc->Buffer.Length < 256) ?
SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY);
SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY, 0);
break;
case ACPI_TYPE_STRING:
@ -205,7 +205,7 @@ AcpiExDoDebugObject (
/* Case for DdbHandle */
AcpiOsPrintf ("Table Index 0x%X\n", SourceDesc->Reference.Value);
return;
return_VOID;
default:
break;
@ -274,5 +274,3 @@ AcpiExDoDebugObject (
return_VOID;
}
#endif

3
sys/contrib/dev/acpica/components/executer/exdump.c
View File

@ -1015,7 +1015,7 @@ AcpiExDumpPackageObj (
AcpiOsPrintf ("[Buffer] Length %.2X = ", ObjDesc->Buffer.Length);
if (ObjDesc->Buffer.Length)
{
AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer),
AcpiUtDebugDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer),
ObjDesc->Buffer.Length, DB_DWORD_DISPLAY, _COMPONENT);
}
else
@ -1122,4 +1122,3 @@ AcpiExDumpObjectDescriptor (
}
#endif

2
sys/contrib/dev/acpica/components/executer/exfield.c
View File

@ -402,5 +402,3 @@ AcpiExWriteDataToField (
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/executer/exfldio.c
View File

@ -1051,5 +1051,3 @@ AcpiExInsertIntoField (
}
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exmisc.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
@ -796,5 +795,3 @@ AcpiExDoLogicalOp (
*LogicalResult = LocalResult;
return_ACPI_STATUS (Status);
}

8
sys/contrib/dev/acpica/components/executer/exmutex.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exmutex - ASL Mutex Acquire/Release functions
@ -341,7 +340,7 @@ AcpiExReleaseMutexObject (
if (ObjDesc->Mutex.AcquisitionDepth == 0)
{
return (AE_NOT_ACQUIRED);
return_ACPI_STATUS (AE_NOT_ACQUIRED);
}
/* Match multiple Acquires with multiple Releases */
@ -515,7 +514,7 @@ AcpiExReleaseAllMutexes (
ACPI_OPERAND_OBJECT *ObjDesc;
ACPI_FUNCTION_ENTRY ();
ACPI_FUNCTION_NAME (ExReleaseAllMutexes);
/* Traverse the list of owned mutexes, releasing each one */
@ -529,6 +528,9 @@ AcpiExReleaseAllMutexes (
ObjDesc->Mutex.Next = NULL;
ObjDesc->Mutex.AcquisitionDepth = 0;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Force-releasing held mutex: %p\n", ObjDesc));
/* Release the mutex, special case for Global Lock */
if (ObjDesc == AcpiGbl_GlobalLockMutex)

3
sys/contrib/dev/acpica/components/executer/exnames.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exnames - interpreter/scanner name load/execute
@ -484,5 +483,3 @@ AcpiExGetNameString (
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/executer/exoparg1.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exoparg1 - AML execution - opcodes with 1 argument
@ -1108,4 +1107,3 @@ AcpiExOpcode_1A_0T_1R (
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/executer/exoparg2.c
View File

@ -638,5 +638,3 @@ AcpiExOpcode_2A_0T_1R (
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exoparg3.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exoparg3 - AML execution - opcodes with 3 arguments
@ -300,5 +299,3 @@ AcpiExOpcode_3A_1T_1R (
}
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exoparg6.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exoparg6 - AML execution - opcodes with 6 arguments
@ -209,7 +208,7 @@ AcpiExDoMatch (
return (FALSE);
}
return LogicalResult;
return (LogicalResult);
}

2
sys/contrib/dev/acpica/components/executer/exprep.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
@ -645,4 +644,3 @@ AcpiExPrepFieldValue (
AcpiUtRemoveReference (ObjDesc);
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exregion.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exregion - ACPI default OpRegion (address space) handlers
@ -561,5 +560,3 @@ AcpiExDataTableSpaceHandler (
return_ACPI_STATUS (AE_OK);
}

3
sys/contrib/dev/acpica/components/executer/exresnte.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exresnte - AML Interpreter object resolution
@ -298,5 +297,3 @@ AcpiExResolveNodeToValue (
*ObjectPtr = (void *) ObjDesc;
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exresolv.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exresolv - AML Interpreter object resolution
@ -576,5 +575,3 @@ AcpiExResolveMultiple (
}
return_ACPI_STATUS (AE_OK);
}

3
sys/contrib/dev/acpica/components/executer/exresop.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exresop - AML Interpreter operand/object resolution
@ -734,5 +733,3 @@ AcpiExResolveOperands (
return_ACPI_STATUS (Status);
}

2
sys/contrib/dev/acpica/components/executer/exstore.c
View File

@ -527,5 +527,3 @@ AcpiExStoreObjectToNode (
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exstoren.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exstoren - AML Interpreter object store support,
@ -310,5 +309,3 @@ AcpiExStoreObjectToObject (
*NewDesc = DestDesc;
return_ACPI_STATUS (Status);
}

3
sys/contrib/dev/acpica/components/executer/exstorob.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exstorob - AML Interpreter object store support, store to object
@ -240,5 +239,3 @@ AcpiExStoreStringToString (
TargetDesc->String.Length = Length;
return_ACPI_STATUS (AE_OK);
}

2
sys/contrib/dev/acpica/components/executer/exsystem.c
View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Module Name: exsystem - Interface to OS services
@ -352,4 +351,3 @@ AcpiExSystemResetEvent (
return (Status);
}

Some files were not shown because too many files have changed in this diff Show More