Changed Acpi_Gbl to AcpiGbl_

date	2000.06.16.20.07.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 18:54:46 +00:00
parent e7da47204d
commit f91c34742d
4 changed files with 44 additions and 44 deletions

View File

@ -184,7 +184,7 @@ AcpiTbInstallTable (
}
DEBUG_PRINT (ACPI_INFO, ("%s located at %p\n",
Acpi_GblAcpiTableData[TableType].Name, TableHeader));
AcpiGbl_AcpiTableData[TableType].Name, TableHeader));
AcpiCmReleaseMutex (MTX_TABLES);
return_ACPI_STATUS (AE_OK);
@ -238,14 +238,14 @@ AcpiTbRecognizeTable (
Status = AE_SUPPORT;
for (i = 1; i < NUM_ACPI_TABLES; i++) /* Start at one -> Skip RSDP */
{
if (!STRNCMP (TableHeader->Signature, Acpi_GblAcpiTableData[i].Signature, Acpi_GblAcpiTableData[i].SigLength))
if (!STRNCMP (TableHeader->Signature, AcpiGbl_AcpiTableData[i].Signature, AcpiGbl_AcpiTableData[i].SigLength))
{
/* Found a signature match, get the pertinent info from the TableData structure */
TableType = i;
Status = Acpi_GblAcpiTableData[i].Status; /* AE_SUPPORT or AE_OK */
Status = AcpiGbl_AcpiTableData[i].Status; /* AE_SUPPORT or AE_OK */
DEBUG_PRINT (ACPI_INFO, ("TbRecognizeTable: Found %4.4s\n", Acpi_GblAcpiTableData[i].Signature));
DEBUG_PRINT (ACPI_INFO, ("TbRecognizeTable: Found %4.4s\n", AcpiGbl_AcpiTableData[i].Signature));
break;
}
}
@ -277,7 +277,7 @@ AcpiTbRecognizeTable (
if (Status == AE_SUPPORT)
{
DEBUG_PRINT (ACPI_INFO, ("Unsupported table %s (Type %d) was found and discarded\n",
Acpi_GblAcpiTableData[TableType].Name, TableType));
AcpiGbl_AcpiTableData[TableType].Name, TableType));
}
return_ACPI_STATUS (Status);
@ -312,7 +312,7 @@ AcpiTbInitTableDescriptor (
* Install the table into the global data structure
*/
ListHead = &Acpi_GblAcpiTables[TableType];
ListHead = &AcpiGbl_AcpiTables[TableType];
TableDesc = ListHead;
@ -323,7 +323,7 @@ AcpiTbInitTableDescriptor (
* includes SSDT and PSDTs.
*/
if (Acpi_GblAcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE)
if (AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE)
{
/*
* Only one table allowed, just update the list head
@ -390,9 +390,9 @@ AcpiTbInitTableDescriptor (
/* Set the appropriate global pointer (if there is one) to point to the newly installed table */
if (Acpi_GblAcpiTableData[TableType].GlobalPtr)
if (AcpiGbl_AcpiTableData[TableType].GlobalPtr)
{
*(Acpi_GblAcpiTableData[TableType].GlobalPtr) = TableInfo->Pointer;
*(AcpiGbl_AcpiTableData[TableType].GlobalPtr) = TableInfo->Pointer;
}

View File

@ -1,6 +1,6 @@
/******************************************************************************
*
*
* Module Name: tbutils - Table manipulation utilities
*
*****************************************************************************/
@ -38,9 +38,9 @@
* The above copyright and patent license is granted only if the following
* conditions are met:
*
* 3. Conditions
* 3. Conditions
*
* 3.1. Redistribution of Source with Rights to Further Distribute Source.
* 3.1. Redistribution of Source with Rights to Further Distribute Source.
* Redistribution of source code of any substantial portion of the Covered
* Code or modification with rights to further distribute source must include
* the above Copyright Notice, the above License, this list of Conditions,
@ -48,11 +48,11 @@
* Licensee must cause all Covered Code to which Licensee contributes to
* contain a file documenting the changes Licensee made to create that Covered
* Code and the date of any change. Licensee must include in that file the
* documentation of any changes made by any predecessor Licensee. Licensee
* documentation of any changes made by any predecessor Licensee. Licensee
* must include a prominent statement that the modification is derived,
* directly or indirectly, from Original Intel Code.
*
* 3.2. Redistribution of Source with no Rights to Further Distribute Source.
* 3.2. Redistribution of Source with no Rights to Further Distribute Source.
* Redistribution of source code of any substantial portion of the Covered
* Code or modification without rights to further distribute source must
* include the following Disclaimer and Export Compliance provision in the
@ -86,7 +86,7 @@
* INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
* UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
* IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
* PARTICULAR PURPOSE.
* PARTICULAR PURPOSE.
*
* 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
* OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
@ -126,7 +126,7 @@
/*****************************************************************************
*
*
* FUNCTION: AcpiTbSystemTablePointer
*
* PARAMETERS: *Where - Pointer to be examined
@ -148,7 +148,7 @@ AcpiTbHandleToObject (
for (i = 0; i < ACPI_TABLE_MAX; i++)
{
ListHead = &Acpi_GblAcpiTables[i];
ListHead = &AcpiGbl_AcpiTables[i];
do
{
if (ListHead->TableId == TableId)
@ -159,7 +159,7 @@ AcpiTbHandleToObject (
ListHead = ListHead->Next;
} while (ListHead != &Acpi_GblAcpiTables[i]);
} while (ListHead != &AcpiGbl_AcpiTables[i]);
}
@ -170,7 +170,7 @@ AcpiTbHandleToObject (
/*****************************************************************************
*
*
* FUNCTION: AcpiTbSystemTablePointer
*
* PARAMETERS: *Where - Pointer to be examined
@ -203,7 +203,7 @@ AcpiTbSystemTablePointer (
/* Check for a pointer within the DSDT */
if (IS_IN_ACPI_TABLE (Where, Acpi_GblDSDT))
if (IS_IN_ACPI_TABLE (Where, AcpiGbl_DSDT))
{
return (TRUE);
}
@ -211,9 +211,9 @@ AcpiTbSystemTablePointer (
/* Check each of the loaded SSDTs (if any)*/
TableDesc = &Acpi_GblAcpiTables[TABLE_SSDT];
TableDesc = &AcpiGbl_AcpiTables[TABLE_SSDT];
for (i = 0; i < Acpi_GblAcpiTables[TABLE_SSDT].Count; i++)
for (i = 0; i < AcpiGbl_AcpiTables[TABLE_SSDT].Count; i++)
{
Table = TableDesc->Pointer;
@ -228,9 +228,9 @@ AcpiTbSystemTablePointer (
/* Check each of the loaded PSDTs (if any)*/
TableDesc = &Acpi_GblAcpiTables[TABLE_PSDT];
TableDesc = &AcpiGbl_AcpiTables[TABLE_PSDT];
for (i = 0; i < Acpi_GblAcpiTables[TABLE_PSDT].Count; i++)
for (i = 0; i < AcpiGbl_AcpiTables[TABLE_PSDT].Count; i++)
{
Table = TableDesc->Pointer;
@ -262,10 +262,10 @@ AcpiTbSystemTablePointer (
* DESCRIPTION: Check an ACPI table header for validity
*
* NOTE: Table pointers are validated as follows:
* 1) Table pointer must point to valid physical memory
* 1) Table pointer must point to valid physical memory
* 2) Signature must be 4 ASCII chars, even if we don't recognize the name
* 3) Table must be readable for length specified in the header
* 4) Table checksum must be valid (with the exception of the FACS which
* 4) Table checksum must be valid (with the exception of the FACS which
* has no checksum for some odd reason)
*
******************************************************************************/
@ -291,7 +291,7 @@ AcpiTbValidateTableHeader (
STORE32 (&Signature, &TableHeader->Signature);
if (!AcpiCmValidAcpiName (Signature))
{
DEBUG_PRINT (ACPI_ERROR, ("Table signature at %p [%X] has invalid characters\n",
DEBUG_PRINT (ACPI_ERROR, ("Table signature at %p [%X] has invalid characters\n",
TableHeader, &Signature));
REPORT_WARNING ("Invalid table signature found");
@ -304,7 +304,7 @@ AcpiTbValidateTableHeader (
if (TableHeader->Length < sizeof (ACPI_TABLE_HEADER))
{
DEBUG_PRINT (ACPI_ERROR, ("Invalid length in table header %p name %4.4s\n",
DEBUG_PRINT (ACPI_ERROR, ("Invalid length in table header %p name %4.4s\n",
TableHeader, &Signature));
REPORT_WARNING ("Invalid table header length found");
@ -361,7 +361,7 @@ AcpiTbMapAcpiTable (
TableSize = Table->Length;
/*
/*
* Validate the header and delete the mapping.
* We will create a mapping for the full table below.
*/
@ -370,7 +370,7 @@ AcpiTbMapAcpiTable (
/* Always unmap the memory for the header */
AcpiOsdUnMapMemory (Table, sizeof (ACPI_TABLE_HEADER));
AcpiOsdUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
/* Exit if header invalid */
@ -432,7 +432,7 @@ AcpiTbVerifyTableChecksum (
if (CheckSum)
{
REPORT_ERROR ("Invalid ACPI table checksum");
DEBUG_PRINT (ACPI_INFO, ("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
DEBUG_PRINT (ACPI_INFO, ("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
CheckSum, &TableHeader->Signature));
Status = AE_BAD_CHECKSUM;
@ -452,13 +452,13 @@ AcpiTbVerifyTableChecksum (
*
* RETURNS 8 bit checksum of buffer
*
* DESCRIPTION: Computes an 8 bit checksum of the buffer(length) and returns it.
* DESCRIPTION: Computes an 8 bit checksum of the buffer(length) and returns it.
*
******************************************************************************/
UINT8
AcpiTbChecksum (
void *Buffer,
void *Buffer,
UINT32 Length)
{
UINT8 *limit;
@ -467,9 +467,9 @@ AcpiTbChecksum (
if (Buffer && Length)
{
{
/* Buffer and Length are valid */
limit = (UINT8 *) Buffer + Length;
for (rover = Buffer; rover < limit; rover++)

View File

@ -265,7 +265,7 @@ AcpiUnloadTable (
/* Find all tables of the requested type */
ListHead = &Acpi_GblAcpiTables[TableType];
ListHead = &AcpiGbl_AcpiTables[TableType];
do
{
/* Delete the entire namespace under this table NTE */
@ -276,7 +276,7 @@ AcpiUnloadTable (
AcpiTbDeleteAcpiTable (TableType);
} while (ListHead != &Acpi_GblAcpiTables[TableType]);
} while (ListHead != &AcpiGbl_AcpiTables[TableType]);
return_ACPI_STATUS (AE_OK);
}
@ -289,7 +289,7 @@ AcpiUnloadTable (
* PARAMETERS: TableType - one of the defined table types
* Instance - the non zero instance of the table, allows
* support for multiple tables of the same type
* see Acpi_GblAcpiTableFlag
* see AcpiGbl_AcpiTableFlag
* OutTableHeader - pointer to the ACPI_TABLE_HEADER if successful
*
* DESCRIPTION: This function is called to get an ACPI table header. The caller
@ -330,7 +330,7 @@ AcpiGetTableHeader (
/* Check the table type and instance */
if ((TableType > ACPI_TABLE_MAX) ||
(Acpi_GblAcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
(AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
Instance > 1))
{
return_ACPI_STATUS (AE_BAD_PARAMETER);
@ -369,7 +369,7 @@ AcpiGetTableHeader (
* PARAMETERS: TableType - one of the defined table types
* Instance - the non zero instance of the table, allows
* support for multiple tables of the same type
* see Acpi_GblAcpiTableFlag
* see AcpiGbl_AcpiTableFlag
* RetBuffer - pointer to a structure containing a buffer to
* receive the table
*
@ -417,13 +417,13 @@ AcpiGetTable (
/* Check the table type and instance */
if ((TableType > ACPI_TABLE_MAX) ||
(Acpi_GblAcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
(AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE &&
Instance > 1))
{
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
/* Get a pointer to the entire table */
Status = AcpiTbGetTablePtr (TableType, Instance, &TblPtr);

View File

@ -159,7 +159,7 @@ AcpiTbGetTableFacs (
/* Must have a valid FACP pointer */
if (!Acpi_GblFACP)
if (!AcpiGbl_FACP)
{
return_ACPI_STATUS (AE_NO_ACPI_TABLES);
}
@ -188,7 +188,7 @@ AcpiTbGetTableFacs (
{
/* Just map the physical memory to our address space */
Status = AcpiTbMapAcpiTable ((void *) Acpi_GblFACP->FirmwareCtrl, &Size, &TablePtr);
Status = AcpiTbMapAcpiTable ((void *) AcpiGbl_FACP->FirmwareCtrl, &Size, &TablePtr);
if (ACPI_FAILURE(Status))
{
return_ACPI_STATUS (Status);