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

Split lines longer than 80

Browse Source 
date	2000.06.29.21.05.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 18:54:52 +00:00
parent 4ce0167f7e
commit ee46e7d8f7
4 changed files with 117 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
source/components/tables/tbinstal.c
View File

@ -126,7 +126,7 @@
MODULE_NAME ("tbinstal");
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbInstallTable
*
@ -183,14 +183,14 @@ AcpiTbInstallTable (
}
DEBUG_PRINT (ACPI_INFO, ("%s located at %p\n",
AcpiGbl_AcpiTableData[TableType].Name, TableHeader));
AcpiGbl_AcpiTableData[TableType].Name, TableHeader));
AcpiCmReleaseMutex (ACPI_MTX_TABLES);
return_ACPI_STATUS (AE_OK);
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbRecognizeTable
*
@ -203,10 +203,11 @@ AcpiTbInstallTable (
*
* NOTE: All table pointers are validated as follows:
* 1) Table pointer must point to valid physical memory
* 2) Signature must be 4 ASCII chars, even if we don't recognize the name
* 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
* has no checksum for some odd reason…)
* 4) Table checksum must be valid (with the exception of the FACS
* which has no checksum for some odd reason)
*
******************************************************************************/
@ -232,19 +233,29 @@ AcpiTbRecognizeTable (
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
/* Search for a signature match among the known table types */
/*
* Search for a signature match among the known table types
* Start at index one -> Skip the RSDP
*/
Status = AE_SUPPORT;
for (i = 1; i < NUM_ACPI_TABLES; i++) /* Start at one -> Skip RSDP */
for (i = 1; i < NUM_ACPI_TABLES; i++)
{
if (!STRNCMP (TableHeader->Signature, AcpiGbl_AcpiTableData[i].Signature, AcpiGbl_AcpiTableData[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 */
/*
* Found a signature match, get the pertinent info from the
* TableData structure
*/
TableType = i;
Status = AcpiGbl_AcpiTableData[i].Status; /* AE_SUPPORT or AE_OK */
Status = AcpiGbl_AcpiTableData[i].Status;
DEBUG_PRINT (ACPI_INFO, ("TbRecognizeTable: Found %4.4s\n", AcpiGbl_AcpiTableData[i].Signature));
DEBUG_PRINT (ACPI_INFO,
("TbRecognizeTable: Found %4.4s\n",
AcpiGbl_AcpiTableData[i].Signature));
break;
}
}
@ -275,15 +286,16 @@ AcpiTbRecognizeTable (
if (Status == AE_SUPPORT)
{
DEBUG_PRINT (ACPI_INFO, ("Unsupported table %s (Type %d) was found and discarded\n",
AcpiGbl_AcpiTableData[TableType].Name, TableType));
DEBUG_PRINT (ACPI_INFO,
("Unsupported table %s (Type %d) was found and discarded\n",
AcpiGbl_AcpiTableData[TableType].Name, TableType));
}
return_ACPI_STATUS (Status);
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbInitTableDescriptor
*
@ -294,7 +306,7 @@ AcpiTbRecognizeTable (
*
* DESCRIPTION: Install a table into the global data structs.
*
***************************************************************************/
******************************************************************************/
ACPI_STATUS
AcpiTbInitTableDescriptor (
@ -316,9 +328,9 @@ AcpiTbInitTableDescriptor (
/*
* Two major types of tables: 1) Only one instance is allowed. This includes most
* ACPI tables such as the DSDT. 2) Multiple instances of the table are allowed. This
* includes SSDT and PSDTs.
* Two major types of tables: 1) Only one instance is allowed. This
* includes most ACPI tables such as the DSDT. 2) Multiple instances of
* the table are allowed. This includes SSDT and PSDTs.
*/
if (AcpiGbl_AcpiTableData[TableType].Flags == ACPI_TABLE_SINGLE)
@ -381,12 +393,15 @@ AcpiTbInitTableDescriptor (
TableDesc->Length = TableInfo->Length;
TableDesc->Allocation = TableInfo->Allocation;
TableDesc->AmlPointer = (UINT8 *) (TableDesc->Pointer + 1),
TableDesc->AmlLength = (UINT32) (TableDesc->Length - (UINT32) sizeof (ACPI_TABLE_HEADER));
TableDesc->AmlLength = (UINT32) (TableDesc->Length -
(UINT32) sizeof (ACPI_TABLE_HEADER));
TableDesc->TableId = AcpiCmAllocateOwnerId (OWNER_TYPE_TABLE);
TableDesc->LoadedIntoNamespace = FALSE;
/* Set the appropriate global pointer (if there is one) to point to the newly installed table */
/*
* Set the appropriate global pointer (if there is one) to point to the
* newly installed table
*/
if (AcpiGbl_AcpiTableData[TableType].GlobalPtr)
{
@ -403,7 +418,7 @@ AcpiTbInitTableDescriptor (
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbDeleteAcpiTables
*
@ -413,7 +428,7 @@ AcpiTbInitTableDescriptor (
*
* DESCRIPTION: Delete all internal ACPI tables
*
***************************************************************************/
******************************************************************************/
void
AcpiTbDeleteAcpiTables (void)
@ -434,7 +449,7 @@ AcpiTbDeleteAcpiTables (void)
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbDeleteAcpiTable
*
@ -445,7 +460,7 @@ AcpiTbDeleteAcpiTables (void)
* DESCRIPTION: Delete an internal ACPI table
* Locks the ACPI table mutex
*
***************************************************************************/
******************************************************************************/
void
AcpiTbDeleteAcpiTable (
@ -514,7 +529,7 @@ AcpiTbDeleteAcpiTable (
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbDeleteSingleTable
*
@ -526,7 +541,7 @@ AcpiTbDeleteAcpiTable (
* is either installed or has never been installed.
* Table mutex should be locked.
*
***************************************************************************/
******************************************************************************/
ACPI_TABLE_DESC *
AcpiTbDeleteSingleTable (
@ -614,7 +629,7 @@ AcpiTbDeleteSingleTable (
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbFreeAcpiTablesOfType
*
@ -625,7 +640,7 @@ AcpiTbDeleteSingleTable (
* DESCRIPTION: Free the memory associated with an internal ACPI table
* Table mutex should be locked.
*
***************************************************************************/
******************************************************************************/
void
AcpiTbFreeAcpiTablesOfType (

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

@ -125,7 +125,7 @@
MODULE_NAME ("tbutils");
/*****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbSystemTablePointer
*
@ -135,7 +135,7 @@
* system tables such as the DSDT or an SSDT.)
* FALSE otherwise
*
****************************************************************************/
******************************************************************************/
ACPI_STATUS
AcpiTbHandleToObject (
@ -165,11 +165,10 @@ AcpiTbHandleToObject (
DEBUG_PRINT (ACPI_ERROR, ("TableId=0x%X does not exist\n", TableId));
return AE_BAD_PARAMETER;
}
/*****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbSystemTablePointer
*
@ -179,7 +178,7 @@ AcpiTbHandleToObject (
* system tables such as the DSDT or an SSDT.)
* FALSE otherwise
*
****************************************************************************/
******************************************************************************/
BOOLEAN
AcpiTbSystemTablePointer (
@ -249,7 +248,7 @@ AcpiTbSystemTablePointer (
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbValidateTableHeader
*
@ -261,10 +260,11 @@ AcpiTbSystemTablePointer (
*
* NOTE: Table pointers are validated as follows:
* 1) Table pointer must point to valid physical memory
* 2) Signature must be 4 ASCII chars, even if we don't recognize the name
* 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
* has no checksum for some odd reason…)
* 4) Table checksum must be valid (with the exception of the FACS
* which has no checksum for some odd reason)
*
******************************************************************************/
@ -279,7 +279,8 @@ AcpiTbValidateTableHeader (
if (!AcpiOsReadable (TableHeader, sizeof (ACPI_TABLE_HEADER)))
{
DEBUG_PRINT (ACPI_ERROR, ("Cannot read table header at %p\n", TableHeader));
DEBUG_PRINT (ACPI_ERROR,
("Cannot read table header at %p\n", TableHeader));
return AE_BAD_ADDRESS;
}
@ -289,8 +290,9 @@ AcpiTbValidateTableHeader (
MOVE_UNALIGNED32_TO_32 (&Signature, &TableHeader->Signature);
if (!AcpiCmValidAcpiName (Signature))
{
DEBUG_PRINT (ACPI_ERROR, ("Table signature at %p [%X] has invalid characters\n",
TableHeader, &Signature));
DEBUG_PRINT (ACPI_ERROR,
("Table signature at %p [%X] has invalid characters\n",
TableHeader, &Signature));
REPORT_WARNING ("Invalid table signature found");
DUMP_BUFFER (TableHeader, sizeof (ACPI_TABLE_HEADER));
@ -302,27 +304,27 @@ AcpiTbValidateTableHeader (
if (TableHeader->Length < sizeof (ACPI_TABLE_HEADER))
{
DEBUG_PRINT (ACPI_ERROR, ("Invalid length in table header %p name %4.4s\n",
TableHeader, &Signature));
DEBUG_PRINT (ACPI_ERROR,
("Invalid length in table header %p name %4.4s\n",
TableHeader, &Signature));
REPORT_WARNING ("Invalid table header length found");
DUMP_BUFFER (TableHeader, sizeof (ACPI_TABLE_HEADER));
return AE_BAD_HEADER;
}
return AE_OK;
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbMapAcpiTable
*
* PARAMETERS: PhysicalAddress - Physical address of table to map
* *Size - Size of the table. If zero, the size
* from the table header is used. Actual
* size is returned here.
* from the table header is used.
* Actual size is returned here.
* **LogicalAddress - Logical address of mapped table
*
* RETURN: Logical address of the mapped table.
@ -348,7 +350,8 @@ AcpiTbMapAcpiTable (
{
/* Get the table header so we can extract the table length */
Status = AcpiOsMapMemory (PhysicalAddress, sizeof (ACPI_TABLE_HEADER), (void **)&Table);
Status = AcpiOsMapMemory (PhysicalAddress, sizeof (ACPI_TABLE_HEADER),
(void **) &Table);
if (ACPI_FAILURE (Status))
{
return Status;
@ -380,14 +383,15 @@ AcpiTbMapAcpiTable (
/* Map the physical memory for the correct length */
Status = AcpiOsMapMemory (PhysicalAddress, TableSize, (void **)&Table);
Status = AcpiOsMapMemory (PhysicalAddress, TableSize, (void **) &Table);
if (ACPI_FAILURE (Status))
{
return Status;
}
DEBUG_PRINT (ACPI_INFO, ("Mapped memory for ACPI table, length=%d(0x%X) at %p\n",
TableSize, TableSize, Table));
DEBUG_PRINT (ACPI_INFO,
("Mapped memory for ACPI table, length=%d(0x%X) at %p\n",
TableSize, TableSize, Table));
*Size = TableSize;
*LogicalAddress = Table;
@ -396,7 +400,7 @@ AcpiTbMapAcpiTable (
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbVerifyTableChecksum
*
@ -429,8 +433,9 @@ AcpiTbVerifyTableChecksum (
if (CheckSum)
{
REPORT_ERROR ("Invalid ACPI table checksum");
DEBUG_PRINT (ACPI_INFO, ("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
CheckSum, &TableHeader->Signature));
DEBUG_PRINT (ACPI_INFO,
("TbVerifyTableChecksum: Invalid checksum (%X) in %4.4s\n",
CheckSum, &TableHeader->Signature));
Status = AE_BAD_CHECKSUM;
}
@ -440,7 +445,7 @@ AcpiTbVerifyTableChecksum (
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbChecksum
*

17
source/components/tables/tbxface.c
View File

@ -127,7 +127,7 @@
MODULE_NAME ("tbxface");
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiLoadFirmwareTables
*
@ -173,13 +173,15 @@ AcpiLoadFirmwareTables (void)
ErrorExit:
DEBUG_PRINT (ACPI_ERROR, ("Failure during ACPI Table Init: %s\n", AcpiCmFormatException (Status)));
DEBUG_PRINT (ACPI_ERROR,
("Failure during ACPI Table Init: %s\n",
AcpiCmFormatException (Status)));
return_ACPI_STATUS (Status);
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiLoadTable
*
@ -232,7 +234,7 @@ AcpiLoadTable (
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiUnloadTable
*
@ -281,7 +283,7 @@ AcpiUnloadTable (
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiGetTableHeader
*
@ -355,13 +357,14 @@ AcpiGetTableHeader (
/*
* Copy the header to the caller's buffer
*/
MEMCPY ((void *) OutTableHeader, (void *) TblPtr, sizeof (ACPI_TABLE_HEADER));
MEMCPY ((void *) OutTableHeader, (void *) TblPtr,
sizeof (ACPI_TABLE_HEADER));
return_ACPI_STATUS (Status);
}
/****************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiGetTable
*

48
source/components/tables/tbxfroot.c
View File

@ -125,7 +125,7 @@
MODULE_NAME ("tbtable");
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbGetTableRsdt
*
@ -173,12 +173,17 @@ AcpiTbGetTableRsdt (
* RSDP structure was found; Now get the RSDT
*/
DEBUG_PRINT (ACPI_INFO, ("RSDP located at %p, RSDT physical=%p \n", AcpiGbl_RSDP, AcpiGbl_RSDP->RsdtPhysicalAddress));
DEBUG_PRINT (ACPI_INFO,
("RSDP located at %p, RSDT physical=%p \n",
AcpiGbl_RSDP, AcpiGbl_RSDP->RsdtPhysicalAddress));
Status = AcpiTbGetTable ((void *) AcpiGbl_RSDP->RsdtPhysicalAddress, NULL, &TableInfo);
Status = AcpiTbGetTable ((void *) AcpiGbl_RSDP->RsdtPhysicalAddress, NULL,
&TableInfo);
if (ACPI_FAILURE (Status))
{
DEBUG_PRINT (ACPI_ERROR, ("GetRsdt: Could not get the RSDT, %s\n", AcpiCmFormatException (Status)));
DEBUG_PRINT (ACPI_ERROR,
("GetRsdt: Could not get the RSDT, %s\n",
AcpiCmFormatException (Status)));
if (Status == AE_BAD_SIGNATURE)
{
@ -188,8 +193,9 @@ AcpiTbGetTableRsdt (
DUMP_BUFFER (AcpiGbl_RSDP, 20);
DEBUG_PRINT_RAW (ACPI_ERROR, ("RSDP points to RSDT at %lXh, but RSDT signature is invalid\n",
(void *) AcpiGbl_RSDP->RsdtPhysicalAddress));
DEBUG_PRINT_RAW (ACPI_ERROR,
("RSDP points to RSDT at %lXh, but RSDT signature is invalid\n",
(void *) AcpiGbl_RSDP->RsdtPhysicalAddress));
}
}
@ -221,14 +227,15 @@ AcpiTbGetTableRsdt (
/* Determine the number of tables pointed to by the RSDT */
*NumberOfTables = (INT32) DIV_4 (AcpiGbl_RSDT->header.Length - sizeof (ACPI_TABLE_HEADER));
*NumberOfTables = (INT32) DIV_4 (AcpiGbl_RSDT->header.Length -
sizeof (ACPI_TABLE_HEADER));
return_ACPI_STATUS (Status);
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbScanMemoryForRsdp
*
@ -260,7 +267,8 @@ AcpiTbScanMemoryForRsdp (
/* The signature and checksum must both be correct */
if (STRNCMP (MemRover, RSDP_SIG, sizeof (RSDP_SIG)-1) == 0 &&
AcpiTbChecksum (MemRover, sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) == 0)
AcpiTbChecksum (MemRover,
sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) == 0)
{
/* If so, we have found the RSDP */
@ -274,7 +282,7 @@ AcpiTbScanMemoryForRsdp (
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbFindRsdp
*
@ -336,7 +344,8 @@ AcpiTbFindRsdp (
/* The signature and checksum must both be correct */
if (AcpiTbChecksum (TablePtr, sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) != 0)
if (AcpiTbChecksum (TablePtr,
sizeof (ROOT_SYSTEM_DESCRIPTOR_POINTER)) != 0)
{
/* Nope, BAD Checksum */
@ -358,7 +367,8 @@ AcpiTbFindRsdp (
* Search memory for RSDP. First map low physical memory.
*/
Status = AcpiOsMapMemory (LO_RSDP_WINDOW_BASE, LO_RSDP_WINDOW_SIZE, (void **)&TablePtr);
Status = AcpiOsMapMemory (LO_RSDP_WINDOW_BASE, LO_RSDP_WINDOW_SIZE,
(void **)&TablePtr);
if (ACPI_FAILURE (Status))
{
@ -369,7 +379,8 @@ AcpiTbFindRsdp (
* 1) Search EBDA (low memory) paragraphs
*/
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr, LO_RSDP_WINDOW_SIZE)))
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr,
LO_RSDP_WINDOW_SIZE)))
{
/* Found it, return pointer and don't delete the mapping */
@ -390,14 +401,16 @@ AcpiTbFindRsdp (
* 2) Search upper memory: 16-byte boundaries in E0000h-F0000h
*/
Status = AcpiOsMapMemory (HI_RSDP_WINDOW_BASE, HI_RSDP_WINDOW_SIZE, (void **)&TablePtr);
Status = AcpiOsMapMemory (HI_RSDP_WINDOW_BASE, HI_RSDP_WINDOW_SIZE,
(void **)&TablePtr);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr, HI_RSDP_WINDOW_SIZE)))
if (NULL != (MemRover = AcpiTbScanMemoryForRsdp (TablePtr,
HI_RSDP_WINDOW_SIZE)))
{
/* Found it, return pointer and don't delete the mapping */
@ -420,7 +433,7 @@ AcpiTbFindRsdp (
}
/******************************************************************************
/*******************************************************************************
*
* FUNCTION: AcpiTbGetTableFacs
*
@ -482,7 +495,8 @@ AcpiTbGetTableFacs (
{
/* Just map the physical memory to our address space */
Status = AcpiTbMapAcpiTable ((void *) AcpiGbl_FACP->FirmwareCtrl, &Size, &TablePtr);
Status = AcpiTbMapAcpiTable ((void *) AcpiGbl_FACP->FirmwareCtrl,
&Size, &TablePtr);
if (ACPI_FAILURE(Status))
{
return_ACPI_STATUS (Status);