mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-15 22:09:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes only, no functional changes.

Browse Source 
Lint changes, fix compiler warnings, etc.
This commit is contained in:
rmoore1 2007-10-25 22:52:06 +00:00
parent 006ad111ec
commit 500fff6f63
40 changed files with 163 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/components/debugger/dbcmds.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
* $Revision: 1.154 $
* $Revision: 1.155 $
*
******************************************************************************/
@ -1411,8 +1411,8 @@ AcpiDmTestResourceConversion (
OriginalAml = ReturnObj.Pointer;
AcpiDmCompareAmlResources (
OriginalAml->Buffer.Pointer, OriginalAml->Buffer.Length,
NewAml.Pointer, NewAml.Length);
OriginalAml->Buffer.Pointer, (ACPI_RSDESC_SIZE) OriginalAml->Buffer.Length,
NewAml.Pointer, (ACPI_RSDESC_SIZE) NewAml.Length);
/* Cleanup and exit */

8
source/components/debugger/dbexec.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbexec - debugger control method execution
* $Revision: 1.81 $
* $Revision: 1.82 $
*
******************************************************************************/
@ -551,7 +551,7 @@ AcpiDbMethodThread (
/* Signal our completion */
Allow = 0;
AcpiOsWaitSemaphore (Info->ThreadCompleteGate, 1, ACPI_WAIT_FOREVER);
(void) AcpiOsWaitSemaphore (Info->ThreadCompleteGate, 1, ACPI_WAIT_FOREVER);
Info->NumCompleted++;
if (Info->NumCompleted == Info->NumThreads)
@ -560,7 +560,7 @@ AcpiDbMethodThread (
Allow = 1;
}
AcpiOsSignalSemaphore (Info->ThreadCompleteGate, 1);
(void) AcpiOsSignalSemaphore (Info->ThreadCompleteGate, 1);
if (Allow)
{
@ -692,7 +692,7 @@ AcpiDbCreateExecutionThreads (
/* Wait for all threads to complete */
AcpiOsWaitSemaphore (MainThreadGate, 1, ACPI_WAIT_FOREVER);
(void) AcpiOsWaitSemaphore (MainThreadGate, 1, ACPI_WAIT_FOREVER);
AcpiDbSetOutputDestination (ACPI_DB_DUPLICATE_OUTPUT);
AcpiOsPrintf ("All threads (%X) have completed\n", NumThreads);

4
source/components/debugger/dbfileio.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dbfileio - Debugger file I/O commands. These can't usually
* be used when running the debugger in Ring 0 (Kernel mode)
* $Revision: 1.94 $
* $Revision: 1.95 $
*
******************************************************************************/
@ -118,9 +118,7 @@
#include "acpi.h"
#include "acdebug.h"
#include "acnamesp.h"
#include "actables.h"
#include "acdisasm.h"
#if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER)

4
source/components/debugger/dbinput.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbinput - user front-end to the AML debugger
* $Revision: 1.114 $
* $Revision: 1.115 $
*
******************************************************************************/
@ -866,7 +866,7 @@ AcpiDbCommandDispatch (
break;
case CMD_TRACE:
AcpiDebugTrace (AcpiGbl_DbArgs[1],0,0,1);
(void) AcpiDebugTrace (AcpiGbl_DbArgs[1],0,0,1);
break;
case CMD_TREE:

20
source/components/debugger/dbstats.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbstats - Generation and display of ACPI table statistics
* $Revision: 1.87 $
* $Revision: 1.88 $
*
******************************************************************************/
@ -141,9 +141,11 @@ AcpiDbClassifyOneObject (
void *Context,
void **ReturnValue);
#if defined ACPI_DBG_TRACK_ALLOCATIONS || defined ACPI_USE_LOCAL_CACHE
static void
AcpiDbListInfo (
ACPI_MEMORY_LIST *List);
#endif
/*
@ -171,7 +173,6 @@ static ARGUMENT_INFO AcpiDbStatTypes [] =
#if defined ACPI_DBG_TRACK_ALLOCATIONS || defined ACPI_USE_LOCAL_CACHE
/*******************************************************************************
*
* FUNCTION: AcpiDbListInfo
@ -522,17 +523,18 @@ AcpiDbDisplayStatistics (
case CMD_STAT_MEMORY:
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
AcpiOsPrintf ("\n----Object and Cache Statistics (all in hex)---------\n");
AcpiOsPrintf ("\n----Object Statistics (all in hex)---------\n");
AcpiDbListInfo (AcpiGbl_GlobalList);
AcpiDbListInfo (AcpiGbl_NsNodeList);
#endif
#ifdef ACPI_USE_LOCAL_CACHE
AcpiOsPrintf ("\n----Cache Statistics (all in hex)---------\n");
AcpiDbListInfo (AcpiGbl_OperandCache);
AcpiDbListInfo (AcpiGbl_PsNodeCache);
AcpiDbListInfo (AcpiGbl_PsNodeExtCache);
AcpiDbListInfo (AcpiGbl_StateCache);
#endif
#endif
break;
@ -597,13 +599,13 @@ AcpiDbDisplayStatistics (
case CMD_STAT_STACK:
#if defined(ACPI_DEBUG_OUTPUT)
Temp = (UINT32) (AcpiGbl_EntryStackPointer - AcpiGbl_LowestStackPointer);
Temp = (UINT32) ACPI_PTR_DIFF (AcpiGbl_EntryStackPointer, AcpiGbl_LowestStackPointer);
AcpiOsPrintf ("\nSubsystem Stack Usage:\n\n");
AcpiOsPrintf ("Entry Stack Pointer %X\n", AcpiGbl_EntryStackPointer);
AcpiOsPrintf ("Lowest Stack Pointer %X\n", AcpiGbl_LowestStackPointer);
AcpiOsPrintf ("Stack Use %X (%d)\n", Temp, Temp);
AcpiOsPrintf ("Deepest Procedure Nesting %d\n", AcpiGbl_DeepestNesting);
AcpiOsPrintf ("Entry Stack Pointer %p\n", AcpiGbl_EntryStackPointer);
AcpiOsPrintf ("Lowest Stack Pointer %p\n", AcpiGbl_LowestStackPointer);
AcpiOsPrintf ("Stack Use %X (%u)\n", Temp, Temp);
AcpiOsPrintf ("Deepest Procedure Nesting %u\n", AcpiGbl_DeepestNesting);
#endif
break;

6
source/components/debugger/dbutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbutils - AML debugger utilities
* $Revision: 1.84 $
* $Revision: 1.85 $
*
******************************************************************************/
@ -248,7 +248,7 @@ AcpiDbDumpExternalObject (
{
case ACPI_TYPE_ANY:
AcpiOsPrintf ("[Object Reference] = ", ObjDesc->Reference.Handle);
AcpiOsPrintf ("[Object Reference] = %p ", ObjDesc->Reference.Handle);
AcpiDmDisplayInternalObject (ObjDesc->Reference.Handle, NULL);
break;
@ -300,7 +300,7 @@ AcpiDbDumpExternalObject (
case ACPI_TYPE_LOCAL_REFERENCE:
AcpiOsPrintf ("[Object Reference] = ", ObjDesc->Reference.Handle);
AcpiOsPrintf ("[Object Reference] = %p ", ObjDesc->Reference.Handle);
AcpiDmDisplayInternalObject (ObjDesc->Reference.Handle, NULL);
break;

5
source/components/disassembler/dmopcode.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmopcode - AML disassembler, specific AML opcodes
* $Revision: 1.101 $
* $Revision: 1.102 $
*
******************************************************************************/
@ -406,6 +406,9 @@ AcpiDmDisassembleOneOp (
case AML_LLESS_OP:
AcpiOsPrintf ("LGreaterEqual");
break;
default:
break;
}
Op->Common.DisasmOpcode = 0;
Op->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE;

42
source/components/dispatcher/dsmethod.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
* $Revision: 1.136 $
* $Revision: 1.137 $
*
*****************************************************************************/
@ -117,7 +117,6 @@
#define __DSMETHOD_C__
#include "acpi.h"
#include "acparser.h"
#include "amlcode.h"
#include "acdispat.h"
#include "acinterp.h"
@ -183,7 +182,7 @@ AcpiDsMethodError (
WalkState->MethodNode ?
WalkState->MethodNode->Name.Integer : 0,
WalkState->Opcode, WalkState->AmlOffset, NULL);
(void) AcpiExEnterInterpreter ();
AcpiExEnterInterpreter ();
}
#ifdef ACPI_DISASSEMBLER
@ -651,8 +650,6 @@ AcpiDsTerminateControlMethod (
ACPI_OPERAND_OBJECT *MethodDesc,
ACPI_WALK_STATE *WalkState)
{
ACPI_STATUS Status;
ACPI_FUNCTION_TRACE_PTR (DsTerminateControlMethod, WalkState);
@ -669,29 +666,26 @@ AcpiDsTerminateControlMethod (
/* Delete all arguments and locals */
AcpiDsMethodDataDeleteAll (WalkState);
}
/*
* If method is serialized, release the mutex and restore the
* current sync level for this thread
*/
if (MethodDesc->Method.Mutex)
{
/* Acquisition Depth handles recursive calls */
MethodDesc->Method.Mutex->Mutex.AcquisitionDepth--;
if (!MethodDesc->Method.Mutex->Mutex.AcquisitionDepth)
/*
* If method is serialized, release the mutex and restore the
* current sync level for this thread
*/
if (MethodDesc->Method.Mutex)
{
WalkState->Thread->CurrentSyncLevel =
MethodDesc->Method.Mutex->Mutex.OriginalSyncLevel;
/* Acquisition Depth handles recursive calls */
AcpiOsReleaseMutex (MethodDesc->Method.Mutex->Mutex.OsMutex);
MethodDesc->Method.Mutex->Mutex.ThreadId = 0;
MethodDesc->Method.Mutex->Mutex.AcquisitionDepth--;
if (!MethodDesc->Method.Mutex->Mutex.AcquisitionDepth)
{
WalkState->Thread->CurrentSyncLevel =
MethodDesc->Method.Mutex->Mutex.OriginalSyncLevel;
AcpiOsReleaseMutex (MethodDesc->Method.Mutex->Mutex.OsMutex);
MethodDesc->Method.Mutex->Mutex.ThreadId = 0;
}
}
}
if (WalkState)
{
/*
* Delete any namespace objects created anywhere within
* the namespace by the execution of this method
@ -740,7 +734,7 @@ AcpiDsTerminateControlMethod (
if ((MethodDesc->Method.MethodFlags & AML_METHOD_SERIALIZED) &&
(!MethodDesc->Method.Mutex))
{
Status = AcpiDsCreateMethodMutex (MethodDesc);
(void) AcpiDsCreateMethodMutex (MethodDesc);
}
/* No more threads, we can free the OwnerId */

4
source/components/dispatcher/dsobject.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsobject - Dispatcher object management routines
* $Revision: 1.137 $
* $Revision: 1.138 $
*
*****************************************************************************/
@ -231,7 +231,7 @@ AcpiDsBuildInternalObject (
* will remain as named references. This behavior is not described
* in the ACPI spec, but it appears to be an oversight.
*/
ObjDesc = (ACPI_OPERAND_OBJECT *) Op->Common.Node;
ObjDesc = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Op->Common.Node);
Status = AcpiExResolveNodeToValue (
ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &ObjDesc),

4
source/components/dispatcher/dsopcode.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dsopcode - Dispatcher Op Region support and handling of
* "control" opcodes
* $Revision: 1.111 $
* $Revision: 1.112 $
*
*****************************************************************************/
@ -905,7 +905,7 @@ AcpiDsEvalRegionOperands (
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
ObjDesc,
ACPI_FORMAT_UINT64 (ObjDesc->Region.Address),
ACPI_FORMAT_NATIVE_UINT (ObjDesc->Region.Address),
ObjDesc->Region.Length));
/* Now the address and length are valid for this opregion */

12
source/components/dispatcher/dsutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
* $Revision: 1.124 $
* $Revision: 1.125 $
*
******************************************************************************/
@ -826,10 +826,9 @@ AcpiDsCreateOperands (
ACPI_STATUS Status = AE_OK;
ACPI_PARSE_OBJECT *Arg;
ACPI_PARSE_OBJECT *Arguments[ACPI_OBJ_NUM_OPERANDS];
UINT8 ArgCount = 0;
UINT8 Count = 0;
UINT8 Index = WalkState->NumOperands;
UINT8 i;
UINT32 ArgCount = 0;
UINT32 Index = WalkState->NumOperands;
UINT32 i;
ACPI_FUNCTION_TRACE_PTR (DsCreateOperands, FirstArg);
@ -865,7 +864,7 @@ AcpiDsCreateOperands (
/* Force the filling of the operand stack in inverse order */
WalkState->OperandIndex = Index;
WalkState->OperandIndex = (UINT8) Index;
Status = AcpiDsCreateOperand (WalkState, Arg, Index);
if (ACPI_FAILURE (Status))
@ -873,7 +872,6 @@ AcpiDsCreateOperands (
goto Cleanup;
}
Count++;
Index--;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Arg #%d (%p) done, Arg1=%p\n",

8
source/components/dispatcher/dswstate.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dswstate - Dispatcher parse tree walk management routines
* $Revision: 1.103 $
* $Revision: 1.104 $
*
*****************************************************************************/
@ -320,7 +320,7 @@ AcpiDsResultStackPush (
/* Check for stack overflow */
if ((WalkState->ResultSize + ACPI_RESULTS_FRAME_OBJ_NUM) >
if (((UINT32) WalkState->ResultSize + ACPI_RESULTS_FRAME_OBJ_NUM) >
ACPI_RESULTS_OBJ_NUM_MAX)
{
ACPI_ERROR ((AE_INFO, "Result stack overflow: State=%p Num=%X",
@ -517,7 +517,7 @@ AcpiDsObjStackPopAndDelete (
UINT32 PopCount,
ACPI_WALK_STATE *WalkState)
{
UINT32 i;
ACPI_NATIVE_INT i;
ACPI_OPERAND_OBJECT *ObjDesc;
@ -529,7 +529,7 @@ AcpiDsObjStackPopAndDelete (
return;
}
for (i = (PopCount - 1); i >= 0; i--)
for (i = (ACPI_NATIVE_INT)(PopCount - 1); i >= 0; i--)
{
if (WalkState->NumOperands == 0)
{

5
source/components/events/evmisc.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evmisc - Miscellaneous event manager support functions
* $Revision: 1.106 $
* $Revision: 1.107 $
*
*****************************************************************************/
@ -463,7 +463,8 @@ AcpiEvInitGlobalLockHandler (
ACPI_FUNCTION_TRACE (EvInitGlobalLockHandler);
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS, (ACPI_TABLE_HEADER **) &Facs);
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS,
ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER, &Facs));
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);

4
source/components/events/evregion.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: evregion - ACPI AddressSpace (OpRegion) handler dispatch
* $Revision: 1.169 $
* $Revision: 1.170 $
*
*****************************************************************************/
@ -504,7 +504,7 @@ AcpiEvAddressSpaceDispatch (
ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
"Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
&RegionObj->Region.Handler->AddressSpace, Handler,
ACPI_FORMAT_UINT64 (Address),
ACPI_FORMAT_NATIVE_UINT (Address),
AcpiUtGetRegionName (RegionObj->Region.SpaceId)));
if (!(HandlerDesc->AddressSpace.HandlerFlags &

7
source/components/executer/exconfig.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes)
* $Revision: 1.110 $
* $Revision: 1.111 $
*
*****************************************************************************/
@ -121,7 +121,6 @@
#include "acinterp.h"
#include "amlcode.h"
#include "acnamesp.h"
#include "acevents.h"
#include "actables.h"
#include "acdispat.h"
@ -447,7 +446,7 @@ AcpiExLoadOp (
/* Validate checksum here. It won't get validated in TbAddTable */
Status = AcpiTbVerifyChecksum (
(ACPI_TABLE_HEADER *) ObjDesc->Buffer.Pointer, Length);
ACPI_CAST_PTR (ACPI_TABLE_HEADER, ObjDesc->Buffer.Pointer), Length);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
@ -580,7 +579,7 @@ AcpiExUnloadTable (
* (Offset contains the TableId)
*/
AcpiTbDeleteNamespaceByOwner (TableIndex);
AcpiTbReleaseOwnerId (TableIndex);
(void) AcpiTbReleaseOwnerId (TableIndex);
AcpiTbSetTableLoadedFlag (TableIndex, FALSE);

11
source/components/executer/exdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exdump - Interpreter debug output routines
* $Revision: 1.202 $
* $Revision: 1.203 $
*
*****************************************************************************/
@ -608,6 +608,13 @@ AcpiExDumpOperand (
break;
case AML_LOAD_OP:
AcpiOsPrintf ("Reference: [DdbHandle] TableIndex %p\n",
ObjDesc->Reference.Object);
break;
case AML_REF_OF_OP:
AcpiOsPrintf ("Reference: (RefOf) %p\n",
@ -740,7 +747,7 @@ AcpiExDumpOperand (
else
{
AcpiOsPrintf (" base %8.8X%8.8X Length %X\n",
ACPI_FORMAT_UINT64 (ObjDesc->Region.Address),
ACPI_FORMAT_NATIVE_UINT (ObjDesc->Region.Address),
ObjDesc->Region.Length);
}
break;

4
source/components/executer/exfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exfldio - Aml Field I/O
* $Revision: 1.128 $
* $Revision: 1.129 $
*
*****************************************************************************/
@ -365,7 +365,7 @@ AcpiExAccessRegion (
ObjDesc->CommonField.AccessByteWidth,
ObjDesc->CommonField.BaseByteOffset,
FieldDatumByteOffset,
(void *) Address));
ACPI_CAST_PTR (void, Address)));
/* Invoke the appropriate AddressSpace/OpRegion handler */

8
source/components/executer/exregion.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exregion - ACPI default OpRegion (address space) handlers
* $Revision: 1.101 $
* $Revision: 1.102 $
*
*****************************************************************************/
@ -245,7 +245,7 @@ AcpiExSystemMemorySpaceHandler (
{
ACPI_ERROR ((AE_INFO,
"Could not map memory at %8.8X%8.8X, size %X",
ACPI_FORMAT_UINT64 (Address), (UINT32) WindowSize));
ACPI_FORMAT_NATIVE_UINT (Address), (UINT32) WindowSize));
MemInfo->MappedLength = 0;
return_ACPI_STATUS (AE_NO_MEMORY);
}
@ -265,7 +265,7 @@ AcpiExSystemMemorySpaceHandler (
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
BitWidth, Function, ACPI_FORMAT_UINT64 (Address)));
BitWidth, Function, ACPI_FORMAT_NATIVE_UINT (Address)));
/*
* Perform the memory read or write
@ -375,7 +375,7 @@ AcpiExSystemIoSpaceHandler (
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"System-IO (width %d) R/W %d Address=%8.8X%8.8X\n",
BitWidth, Function, ACPI_FORMAT_UINT64 (Address)));
BitWidth, Function, ACPI_FORMAT_NATIVE_UINT (Address)));
/* Decode the function parameter */

7
source/components/executer/exstore.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exstore - AML Interpreter object store support
* $Revision: 1.205 $
* $Revision: 1.206 $
*
*****************************************************************************/
@ -275,7 +275,7 @@ AcpiExDoDebugObject (
if (SourceDesc->Reference.Opcode == AML_LOAD_OP) /* Load and LoadTable */
{
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT,
" Table OwnerId %X\n", SourceDesc->Reference.Object));
" Table OwnerId %p\n", SourceDesc->Reference.Object));
break;
}
@ -300,7 +300,8 @@ AcpiExDoDebugObject (
ACPI_DESC_TYPE_NAMED)
{
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT,
" %p - Not a valid namespace node\n"));
" %p - Not a valid namespace node\n",
SourceDesc->Reference.Node));
}
else
{

3
source/components/executer/exsystem.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exsystem - Interface to OS services
* $Revision: 1.93 $
* $Revision: 1.94 $
*
*****************************************************************************/
@ -119,7 +119,6 @@
#include "acpi.h"
#include "acinterp.h"
#include "acevents.h"
#define _COMPONENT ACPI_EXECUTER
ACPI_MODULE_NAME ("exsystem")

3
source/components/executer/exutils.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exutils - interpreter/scanner utilities
* $Revision: 1.129 $
* $Revision: 1.130 $
*
*****************************************************************************/
@ -136,7 +136,6 @@
#include "acpi.h"
#include "acinterp.h"
#include "amlcode.h"
#include "acevents.h"
#define _COMPONENT ACPI_EXECUTER
ACPI_MODULE_NAME ("exutils")

9
source/components/hardware/hwsleep.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface
* $Revision: 1.87 $
* $Revision: 1.88 $
*
*****************************************************************************/
@ -116,7 +116,6 @@
*****************************************************************************/
#include "acpi.h"
#include "actables.h"
#define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME ("hwsleep")
@ -147,7 +146,8 @@ AcpiSetFirmwareWakingVector (
/* Get the FACS */
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS, (ACPI_TABLE_HEADER **) &Facs);
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS,
ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER, &Facs));
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
@ -209,7 +209,8 @@ AcpiGetFirmwareWakingVector (
/* Get the FACS */
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS, (ACPI_TABLE_HEADER **) &Facs);
Status = AcpiGetTableByIndex (ACPI_TABLE_INDEX_FACS,
ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER, &Facs));
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);

4
source/components/namespace/nsaccess.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsaccess - Top-level functions for accessing ACPI namespace
* $Revision: 1.207 $
* $Revision: 1.208 $
*
******************************************************************************/
@ -715,7 +715,7 @@ AcpiNsLookup (
*
* Then we have a type mismatch. Just warn and ignore it.
*/
if ((TypeToCheckFor != ACPI_TYPE_ANY) &&
if ((TypeToCheckFor != ACPI_TYPE_ANY) &&
(TypeToCheckFor != ACPI_TYPE_LOCAL_ALIAS) &&
(TypeToCheckFor != ACPI_TYPE_LOCAL_METHOD_ALIAS) &&
(TypeToCheckFor != ACPI_TYPE_LOCAL_SCOPE) &&

6
source/components/namespace/nsdump.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsdump - table dumping routines for debug
* $Revision: 1.182 $
* $Revision: 1.183 $
*
*****************************************************************************/
@ -358,7 +358,7 @@ AcpiNsDumpOneObject (
AcpiOsPrintf ("ID %X Len %.4X Addr %p\n",
ObjDesc->Processor.ProcId, ObjDesc->Processor.Length,
(char *) ObjDesc->Processor.Address);
ACPI_CAST_PTR (void, ObjDesc->Processor.Address));
break;
@ -438,7 +438,7 @@ AcpiNsDumpOneObject (
if (ObjDesc->Region.Flags & AOPOBJ_DATA_VALID)
{
AcpiOsPrintf (" Addr %8.8X%8.8X Len %.4X\n",
ACPI_FORMAT_UINT64 (ObjDesc->Region.Address),
ACPI_FORMAT_NATIVE_UINT (ObjDesc->Region.Address),
ObjDesc->Region.Length);
}
else

4
source/components/namespace/nsload.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsload - namespace loading/expanding/contracting procedures
* $Revision: 1.81 $
* $Revision: 1.82 $
*
*****************************************************************************/
@ -202,7 +202,7 @@ AcpiNsLoadTable (
}
else
{
AcpiTbReleaseOwnerId (TableIndex);
(void) AcpiTbReleaseOwnerId (TableIndex);
}
Unlock:

5
source/components/namespace/nsnames.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: nsnames - Name manipulation and search
* $Revision: 1.99 $
* $Revision: 1.100 $
*
******************************************************************************/
@ -279,7 +279,8 @@ AcpiNsGetPathnameLength (
{
if (ACPI_GET_DESCRIPTOR_TYPE (NextNode) != ACPI_DESC_TYPE_NAMED)
{
ACPI_ERROR ((AE_INFO, "Invalid NS Node (%X) while traversing path", NextNode));
ACPI_ERROR ((AE_INFO, "Invalid NS Node (%p) while traversing path",
NextNode));
return 0;
}
Size += ACPI_PATH_SEGMENT_LENGTH;

15
source/components/namespace/nsparse.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: nsparse - namespace interface to AML parser
* $Revision: 1.17 $
* $Revision: 1.18 $
*
*****************************************************************************/
@ -200,21 +200,25 @@ AcpiNsOneCompleteParse (
AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
Status = AcpiDsInitAmlWalk (WalkState, ParseRoot, NULL,
AmlStart, AmlLength, NULL, (UINT8) PassNumber);
AmlStart, (UINT32) AmlLength, NULL, (UINT8) PassNumber);
}
if (ACPI_FAILURE (Status))
{
AcpiDsDeleteWalkState (WalkState);
AcpiPsDeleteParseTree (ParseRoot);
return_ACPI_STATUS (Status);
goto Cleanup;
}
/* StartNode is the default location to load the table */
if (StartNode && StartNode != AcpiGbl_RootNode)
{
AcpiDsScopeStackPush (StartNode, ACPI_TYPE_METHOD, WalkState);
Status = AcpiDsScopeStackPush (StartNode, ACPI_TYPE_METHOD, WalkState);
if (ACPI_FAILURE (Status))
{
AcpiDsDeleteWalkState (WalkState);
goto Cleanup;
}
}
/* Parse the AML */
@ -222,6 +226,7 @@ AcpiNsOneCompleteParse (
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", PassNumber));
Status = AcpiPsParseAml (WalkState);
Cleanup:
AcpiPsDeleteParseTree (ParseRoot);
return_ACPI_STATUS (Status);
}

3
source/components/namespace/nsutils.c
View File

@ -2,7 +2,7 @@
*
* Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
* parents and siblings and Scope manipulation
* $Revision: 1.155 $
* $Revision: 1.156 $
*
*****************************************************************************/
@ -120,7 +120,6 @@
#include "acpi.h"
#include "acnamesp.h"
#include "amlcode.h"
#include "actables.h"
#define _COMPONENT ACPI_NAMESPACE
ACPI_MODULE_NAME ("nsutils")

4
source/components/parser/psopcode.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: psopcode - Parser/Interpreter opcode information table
* $Revision: 1.99 $
* $Revision: 1.100 $
*
*****************************************************************************/
@ -125,7 +125,7 @@
ACPI_MODULE_NAME ("psopcode")
const UINT8 AcpiGbl_ArgumentCount[] = {0,1,1,1,1,2,2,2,2,3,3,6};
static const UINT8 AcpiGbl_ArgumentCount[] = {0,1,1,1,1,2,2,2,2,3,3,6};
/*******************************************************************************

8
source/components/resources/rscalc.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: rscalc - Calculate stream and list lengths
* $Revision: 1.80 $
* $Revision: 1.81 $
*
******************************************************************************/
@ -158,7 +158,7 @@ static UINT8
AcpiRsCountSetBits (
UINT16 BitField)
{
UINT8 BitsSet;
ACPI_NATIVE_UINT BitsSet;
ACPI_FUNCTION_ENTRY ();
@ -168,10 +168,10 @@ AcpiRsCountSetBits (
{
/* Zero the least significant bit that is set */
BitField &= (BitField - 1);
BitField &= (UINT16) (BitField - 1);
}
return (BitsSet);
return ((UINT8) BitsSet);
}

8
source/components/resources/rsutils.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: rsutils - Utilities for the resource manager
* $Revision: 1.67 $
* $Revision: 1.68 $
*
******************************************************************************/
@ -187,7 +187,7 @@ AcpiRsEncodeBitmask (
UINT8 Count)
{
ACPI_NATIVE_UINT i;
UINT16 Mask;
ACPI_NATIVE_UINT Mask;
ACPI_FUNCTION_ENTRY ();
@ -197,10 +197,10 @@ AcpiRsEncodeBitmask (
for (i = 0, Mask = 0; i < Count; i++)
{
Mask |= (0x0001 << List[i]);
Mask |= (0x1 << List[i]);
}
return (Mask);
return ((UINT16) Mask);
}

4
source/components/tables/tbutils.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: tbutils - table utilities
* $Revision: 1.89 $
* $Revision: 1.90 $
*
*****************************************************************************/
@ -181,7 +181,7 @@ AcpiTbPrintTableHeader (
/* FACS only has signature and length fields of common table header */
ACPI_INFO ((AE_INFO, "%4.4s @ 0x%p/0x%04X",
Header->Signature, ACPI_CAST_PTR (void, Address), Header->Length));
Header->Signature, ACPI_CAST_PTR (UINT64, Address), Header->Length));
}
else if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_RSDP))
{

4
source/components/utilities/utalloc.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utalloc - local memory allocation routines
* $Revision: 1.164 $
* $Revision: 1.165 $
*
*****************************************************************************/
@ -225,7 +225,7 @@ AcpiUtDeleteCaches (
if (AcpiGbl_DisplayFinalMemStats)
{
ACPI_STRCPY (Buffer, "MEMORY");
AcpiDbDisplayStatistics (Buffer);
(void) AcpiDbDisplayStatistics (Buffer);
}
#endif

4
source/components/utilities/utcopy.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utcopy - Internal to external object translation utilities
* $Revision: 1.131 $
* $Revision: 1.132 $
*
*****************************************************************************/
@ -684,7 +684,7 @@ AcpiUtCopyEpackageToIpackage (
{
/* Truncate package and delete it */
PackageObject->Package.Count = i;
PackageObject->Package.Count = (UINT32) i;
PackageElements[i] = NULL;
AcpiUtRemoveReference (PackageObject);
return_ACPI_STATUS (Status);

18
source/components/utilities/utdebug.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utdebug - Debug print routines
* $Revision: 1.134 $
* $Revision: 1.135 $
*
*****************************************************************************/
@ -124,9 +124,9 @@
#ifdef ACPI_DEBUG_OUTPUT
static UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF;
static char *AcpiGbl_FnEntryStr = "----Entry";
static char *AcpiGbl_FnExitStr = "----Exit-";
static ACPI_THREAD_ID AcpiGbl_PrevThreadId = 0xFFFFFFFF;
static char *AcpiGbl_FnEntryStr = "----Entry";
static char *AcpiGbl_FnExitStr = "----Exit-";
/* Local prototypes */
@ -151,10 +151,10 @@ void
AcpiUtInitStackPtrTrace (
void)
{
UINT32 CurrentSp;
ACPI_SIZE CurrentSp;
AcpiGbl_EntryStackPointer = ACPI_PTR_DIFF (&CurrentSp, NULL);
AcpiGbl_EntryStackPointer = &CurrentSp;
}
@ -177,11 +177,9 @@ AcpiUtTrackStackPtr (
ACPI_SIZE CurrentSp;
CurrentSp = ACPI_PTR_DIFF (&CurrentSp, NULL);
if (CurrentSp < AcpiGbl_LowestStackPointer)
if (&CurrentSp < AcpiGbl_LowestStackPointer)
{
AcpiGbl_LowestStackPointer = CurrentSp;
AcpiGbl_LowestStackPointer = &CurrentSp;
}
if (AcpiGbl_NestingLevel > AcpiGbl_DeepestNesting)

6
source/components/utilities/utglobal.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utglobal - Global variables for the ACPI subsystem
* $Revision: 1.250 $
* $Revision: 1.251 $
*
*****************************************************************************/
@ -263,7 +263,7 @@ const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] =
* Properties of the ACPI Object Types, both internal and external.
* The table is indexed by values of ACPI_OBJECT_TYPE
*/
const UINT8 AcpiGbl_NsProperties[] =
const UINT8 AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] =
{
ACPI_NS_NORMAL, /* 00 Any */
ACPI_NS_NORMAL, /* 01 Number */
@ -824,7 +824,7 @@ AcpiUtInitGlobals (
#ifdef ACPI_DEBUG_OUTPUT
AcpiGbl_LowestStackPointer = ACPI_SIZE_MAX;
AcpiGbl_LowestStackPointer = ACPI_CAST_PTR (ACPI_SIZE, ACPI_SIZE_MAX);
#endif
#ifdef ACPI_DBG_TRACK_ALLOCATIONS

10
source/include/acglobal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
* $Revision: 1.195 $
* $Revision: 1.196 $
*
*****************************************************************************/
@ -321,8 +321,6 @@ ACPI_EXTERN BOOLEAN AcpiGbl_DisplayFinalMemStats;
*
****************************************************************************/
#define NUM_NS_TYPES ACPI_TYPE_INVALID+1
#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
#define NUM_PREDEFINED_NAMES 10
#else
@ -333,15 +331,15 @@ ACPI_EXTERN ACPI_NAMESPACE_NODE AcpiGbl_RootNodeStruct;
ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_RootNode;
ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_FadtGpeDevice;
extern const UINT8 AcpiGbl_NsProperties[NUM_NS_TYPES];
extern const UINT8 AcpiGbl_NsProperties [ACPI_NUM_NS_TYPES];
extern const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES];
#ifdef ACPI_DEBUG_OUTPUT
ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeCount;
ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeSize;
ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentNodeCount;
ACPI_EXTERN ACPI_SIZE AcpiGbl_EntryStackPointer;
ACPI_EXTERN ACPI_SIZE AcpiGbl_LowestStackPointer;
ACPI_EXTERN ACPI_SIZE *AcpiGbl_EntryStackPointer;
ACPI_EXTERN ACPI_SIZE *AcpiGbl_LowestStackPointer;
ACPI_EXTERN UINT32 AcpiGbl_DeepestNesting;
#endif

13
source/include/acmacros.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 1.195 $
* $Revision: 1.196 $
*
*****************************************************************************/
@ -140,8 +140,11 @@
* Full 64-bit integer must be available on both 32-bit and 64-bit platforms
*/
#define ACPI_LODWORD(l) ((UINT32)(UINT64)(l))
#define ACPI_HIDWORD(l) ((UINT32)(((*(UINT64_STRUCT *)(void *)(&l))).Hi))
#define ACPI_HIDWORD(l) ((UINT16)((((UINT64)(l)) >> 32) & 0xFFFFFFFF))
#if 0
#define ACPI_HIDWORD(l) ((UINT32)(((*(UINT64_STRUCT *)(void *)(&l))).Hi))
#endif
/*
* printf() format helpers
@ -151,6 +154,12 @@
#define ACPI_FORMAT_UINT64(i) ACPI_HIDWORD(i),ACPI_LODWORD(i)
#if ACPI_MACHINE_WIDTH == 64
#define ACPI_FORMAT_NATIVE_UINT(i) ACPI_FORMAT_UINT64(i)
#else
#define ACPI_FORMAT_NATIVE_UINT(i) 0, (i)
#endif
/*
* Extract data using a pointer. Any more than a byte and we
* get into potential aligment issues -- see the STORE macros below.

5
source/include/actypes.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: actypes.h - Common data types for the entire ACPI subsystem
* $Revision: 1.317 $
* $Revision: 1.318 $
*
*****************************************************************************/
@ -570,6 +570,9 @@ typedef UINT32 ACPI_OBJECT_TYPE;
#define ACPI_TYPE_INVALID 0x1E
#define ACPI_TYPE_NOT_FOUND 0xFF
#define ACPI_NUM_NS_TYPES (ACPI_TYPE_INVALID + 1)
/*
* All I/O
*/

6
source/include/platform/acfreebsd.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acfreebsd.h - OS specific defines, etc.
* $Revision: 1.25 $
* $Revision: 1.26 $
*
*****************************************************************************/
@ -124,7 +124,7 @@
#include <sys/types.h>
#include <machine/acpica_machdep.h>
#define ACPI_THREAD_ID pid_t
#define ACPI_THREAD_ID uintptr_t
#define ACPI_UINTPTR_T uintptr_t
#define ACPI_USE_LOCAL_CACHE
#define __cdecl
@ -176,7 +176,7 @@
/* Always use FreeBSD code over our local versions */
#define ACPI_USE_SYSTEM_CLIBRARY
#ifdef _KERNEL
+#if defined(_KERNEL) && (__FreeBSD_version < 700020)
/* Or strstr (used in debugging mode, also move to libkern) */
static __inline char *
strstr (char *s, char *find)