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

Prefixed all global variables with "Gbl_" for easy recognition

Browse Source 
date	99.09.02.18.03.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 17:57:03 +00:00
parent 0d1088707d
commit 8bb7f1340b
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,11 +404,11 @@ OsGetGlobalLock(void)
ACPI_STATUS Status = AE_OK;
if (FACS)
if (Gbl_FACS)
{
/* Only if the FACS is valid */
GlobalLockReg = FACS->GlobalLock;
GlobalLockReg = Gbl_FACS->GlobalLock;
if (GlobalLockReg & GL_OWNED)
{
@ -422,7 +422,7 @@ OsGetGlobalLock(void)
{
/* Its not owned so take ownership and return AE_OK */
FACS->GlobalLock |= GL_OWNED;
Gbl_FACS->GlobalLock |= GL_OWNED;
Status = AE_OK;
}
}
@ -443,8 +443,8 @@ void
OsReleaseGlobalLock (void)
{
if (FACS)
if (Gbl_FACS)
{
FACS->GlobalLock &= 0xFFFFFFFF ^ GL_OWNED;
Gbl_FACS->GlobalLock &= 0xFFFFFFFF ^ GL_OWNED;
}
}

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

@ -27,7 +27,7 @@
* Code in any form, with the right to sublicense such rights; and
*
* 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
* license (without the right to sublicense), under only those claims of Intel
* license (with the right to sublicense), under only those claims of Intel
* patents that are infringed by the Original Intel Code, to make, use, sell,
* offer to sell, and import the Covered Code and derivative works thereof
* solely to the minimum extent necessary to exercise the above copyright
@ -148,24 +148,24 @@ AmlAppendOperandDiag(
UINT16 OpCode,
INT32 NumOperands)
{
METHOD_INFO Method;
ACPI_OBJECT_INTERNAL MthDesc;
AmlGetCurrentLocation (&Method);
AmlGetCurrentLocation (&MthDesc);
DEBUG_PRINT (ACPI_ERROR, (" [%s:%d, opcode = %s AML offset %04x]\n",
FileName, LineNum,
(OpCode > ACPI_UCHAR_MAX)
? LongOps[OpCode & 0x00ff]
: ShortOps[OpCode],
Method.Offset));
? Gbl_LongOps[OpCode & 0x00ff]
: Gbl_ShortOps[OpCode],
MthDesc.Method.Pcode));
if (GetDebugLevel () > 0)
{
DUMP_STACK (MODE_Exec,
DUMP_STACK (IMODE_Execute,
(OpCode > ACPI_UCHAR_MAX)
? LongOps[OpCode & 0x00ff]
: ShortOps[OpCode],
? Gbl_LongOps[OpCode & 0x00ff]
: Gbl_ShortOps[OpCode],
NumOperands,
"after PrepStack failed");
}
@ -192,7 +192,7 @@ UINT32
AmlBufSeq (void)
{
return ++BufSeq;
return ++Gbl_BufSeq;
}
@ -213,7 +213,7 @@ AmlBufSeq (void)
BOOLEAN
AmlAcquireGlobalLock (
UINT16 Rule)
UINT32 Rule)
{
BOOLEAN Locked = FALSE;
@ -223,7 +223,7 @@ AmlAcquireGlobalLock (
/* Only attempt lock if the Rule says so */
if (Rule == (UINT16) GLOCK_AlwaysLock)
if (Rule == (UINT32) GLOCK_AlwaysLock)
{
/* OK to get the lock */
@ -237,13 +237,12 @@ AmlAcquireGlobalLock (
else
{
GlobalLockSet = TRUE;
Gbl_GlobalLockSet = TRUE;
Locked = TRUE;
}
}
FUNCTION_EXIT;
return Locked;
return_VALUE (Locked);
}
@ -274,12 +273,12 @@ AmlReleaseGlobalLock (
{
/* Double check against the global flag */
if (GlobalLockSet)
if (Gbl_GlobalLockSet)
{
/* OK, now release the lock */
OsReleaseGlobalLock ();
GlobalLockSet = FALSE;
Gbl_GlobalLockSet = FALSE;
}
else
@ -291,8 +290,7 @@ AmlReleaseGlobalLock (
}
FUNCTION_EXIT;
return AE_OK;
return_ACPI_STATUS (AE_OK);
}
/******************************************************************************
@ -330,8 +328,7 @@ AmlDigitsNeeded (
{ ; }
}
FUNCTION_EXIT;
return NumDigits;
return_VALUE (NumDigits);
}