Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACPICA] Update to version 20190329. CORE-15900

Browse source
This commit is contained in:
Thomas Faber 2019-03-30 11:18:50 +01:00
parent d605b5063f
commit ba1fb9ace9
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
34 changed files with 98 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/bus/acpi/acpica/dispatcher/dsfield.c
View file

@ -577,7 +577,7 @@ AcpiDsCreateField (
Info.RegionNode = RegionNode; Info.RegionNode = RegionNode;
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
if (Info.RegionNode->Type == ACPI_ADR_SPACE_PLATFORM_COMM && if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM &&
!(RegionNode->Object->Field.InternalPccBuffer !(RegionNode->Object->Field.InternalPccBuffer
= ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length)))
{ {

2
drivers/bus/acpi/acpica/dispatcher/dsinit.c
View file

@ -251,7 +251,7 @@ AcpiDsInitializeObjects (
/* DSDT is always the first AML table */ /* DSDT is always the first AML table */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT)) if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT))
{ {
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
"\nInitializing Namespace objects:\n")); "\nInitializing Namespace objects:\n"));

4
drivers/bus/acpi/acpica/events/evgpeinit.c
View file

@ -339,7 +339,7 @@ AcpiEvMatchGpeMethod (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 GpeNumber; UINT32 GpeNumber;
UINT8 TempGpeNumber; UINT8 TempGpeNumber;
char Name[ACPI_NAME_SIZE + 1]; char Name[ACPI_NAMESEG_SIZE + 1];
UINT8 Type; UINT8 Type;
@ -360,7 +360,7 @@ AcpiEvMatchGpeMethod (
* 1) Extract the method name and null terminate it * 1) Extract the method name and null terminate it
*/ */
ACPI_MOVE_32_TO_32 (Name, &MethodNode->Name.Integer); ACPI_MOVE_32_TO_32 (Name, &MethodNode->Name.Integer);
Name[ACPI_NAME_SIZE] = 0; Name[ACPI_NAMESEG_SIZE] = 0;
/* 2) Name must begin with an underscore */ /* 2) Name must begin with an underscore */

6
drivers/bus/acpi/acpica/executer/exnames.c
View file

@ -99,11 +99,11 @@ AcpiExAllocateNameString (
{ {
/* Special case for root */ /* Special case for root */
SizeNeeded = 1 + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1; SizeNeeded = 1 + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1;
} }
else else
{ {
SizeNeeded = PrefixCount + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1; SizeNeeded = PrefixCount + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1;
} }
/* /*
@ -202,7 +202,7 @@ AcpiExNameSegment (
} }
for (Index = 0; for (Index = 0;
(Index < ACPI_NAME_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0)); (Index < ACPI_NAMESEG_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0));
Index++) Index++)
{ {
CharBuf[Index] = *AmlAddress++; CharBuf[Index] = *AmlAddress++;

4
drivers/bus/acpi/acpica/include/aclocal.h
View file

@ -372,7 +372,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) (
*/ */
typedef struct acpi_name_info typedef struct acpi_name_info
{ {
char Name[ACPI_NAME_SIZE]; char Name[ACPI_NAMESEG_SIZE];
UINT16 ArgumentList; UINT16 ArgumentList;
UINT8 ExpectedBtypes; UINT8 ExpectedBtypes;
@ -460,7 +460,7 @@ typedef ACPI_STATUS (*ACPI_OBJECT_CONVERTER) (
typedef struct acpi_simple_repair_info typedef struct acpi_simple_repair_info
{ {
char Name[ACPI_NAME_SIZE]; char Name[ACPI_NAMESEG_SIZE];
UINT32 UnexpectedBtypes; UINT32 UnexpectedBtypes;
UINT32 PackageIndex; UINT32 PackageIndex;
ACPI_OBJECT_CONVERTER ObjectConverter; ACPI_OBJECT_CONVERTER ObjectConverter;

2
drivers/bus/acpi/acpica/include/acpixf.h
View file

@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */ /* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20190215 #define ACPI_CA_VERSION 0x20190329
#include "acconfig.h" #include "acconfig.h"
#include "actypes.h" #include "actypes.h"

4
drivers/bus/acpi/acpica/include/actbl.h
View file

@ -105,14 +105,14 @@
typedef struct acpi_table_header typedef struct acpi_table_header
{ {
char Signature[ACPI_NAME_SIZE]; /* ASCII table signature */ char Signature[ACPI_NAMESEG_SIZE]; /* ASCII table signature */
UINT32 Length; /* Length of table in bytes, including this header */ UINT32 Length; /* Length of table in bytes, including this header */
UINT8 Revision; /* ACPI Specification minor version number */ UINT8 Revision; /* ACPI Specification minor version number */
UINT8 Checksum; /* To make sum of entire table == 0 */ UINT8 Checksum; /* To make sum of entire table == 0 */
char OemId[ACPI_OEM_ID_SIZE]; /* ASCII OEM identification */ char OemId[ACPI_OEM_ID_SIZE]; /* ASCII OEM identification */
char OemTableId[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table identification */ char OemTableId[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table identification */
UINT32 OemRevision; /* OEM revision number */ UINT32 OemRevision; /* OEM revision number */
char AslCompilerId[ACPI_NAME_SIZE]; /* ASCII ASL compiler vendor ID */ char AslCompilerId[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */
UINT32 AslCompilerRevision; /* ASL compiler version */ UINT32 AslCompilerRevision; /* ASL compiler version */
} ACPI_TABLE_HEADER; } ACPI_TABLE_HEADER;

12
drivers/bus/acpi/acpica/include/actypes.h
View file

@ -412,7 +412,7 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS;
/* Names within the namespace are 4 bytes long */ /* Names within the namespace are 4 bytes long */
#define ACPI_NAME_SIZE 4 #define ACPI_NAMESEG_SIZE 4 /* Fixed by ACPI spec */
#define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for separator */ #define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for separator */
#define ACPI_PATH_SEPARATOR '.' #define ACPI_PATH_SEPARATOR '.'
@ -558,11 +558,11 @@ typedef UINT64 ACPI_INTEGER;
/* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */ /* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b))) #define ACPI_COMPARE_NAMESEG(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b)))
#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
#else #else
#define ACPI_COMPARE_NAME(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) #define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
#define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) #define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
#endif #endif
/* Support for the special RSDP signature (8 characters) */ /* Support for the special RSDP signature (8 characters) */
@ -572,7 +572,7 @@ typedef UINT64 ACPI_INTEGER;
/* Support for OEMx signature (x can be any character) */ /* Support for OEMx signature (x can be any character) */
#define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\ #define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\
strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE) strnlen (a, ACPI_NAMESEG_SIZE) == ACPI_NAMESEG_SIZE)
/* /*
* Algorithm to obtain access bit width. * Algorithm to obtain access bit width.

5
drivers/bus/acpi/acpica/include/platform/aclinux.h
View file

@ -113,6 +113,11 @@
#define ACPI_NO_ERROR_MESSAGES #define ACPI_NO_ERROR_MESSAGES
#undef ACPI_DEBUG_OUTPUT #undef ACPI_DEBUG_OUTPUT
/* Use a specific bugging default separate from ACPICA */
#undef ACPI_DEBUG_DEFAULT
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR)
/* External interface for __KERNEL__, stub is needed */ /* External interface for __KERNEL__, stub is needed */
#define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \ #define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \

2
drivers/bus/acpi/acpica/namespace/nsaccess.c
View file

@ -743,7 +743,7 @@ AcpiNsLookup (
/* Point to next name segment and make this node current */ /* Point to next name segment and make this node current */
Path += ACPI_NAME_SIZE; Path += ACPI_NAMESEG_SIZE;
CurrentNode = ThisNode; CurrentNode = ThisNode;
} }

2
drivers/bus/acpi/acpica/namespace/nsdump.c
View file

@ -127,7 +127,7 @@ AcpiNsPrintPathname (
AcpiOsPrintf ("?"); AcpiOsPrintf ("?");
} }
Pathname += ACPI_NAME_SIZE; Pathname += ACPI_NAMESEG_SIZE;
NumSegments--; NumSegments--;
if (NumSegments) if (NumSegments)
{ {

4
drivers/bus/acpi/acpica/namespace/nsinit.c
View file

@ -554,7 +554,7 @@ AcpiNsFindIniMethods (
/* We are only looking for methods named _INI */ /* We are only looking for methods named _INI */
if (!ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__INI)) if (!ACPI_COMPARE_NAMESEG (Node->Name.Ascii, METHOD_NAME__INI))
{ {
return (AE_OK); return (AE_OK);
} }
@ -731,7 +731,7 @@ AcpiNsInitOneDevice (
* Note: We know there is an _INI within this subtree, but it may not be * Note: We know there is an _INI within this subtree, but it may not be
* under this particular device, it may be lower in the branch. * under this particular device, it may be lower in the branch.
*/ */
if (!ACPI_COMPARE_NAME (DeviceNode->Name.Ascii, "_SB_") || if (!ACPI_COMPARE_NAMESEG (DeviceNode->Name.Ascii, "_SB_") ||
DeviceNode->Parent != AcpiGbl_RootNode) DeviceNode->Parent != AcpiGbl_RootNode)
{ {
ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname ( ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname (

8
drivers/bus/acpi/acpica/namespace/nsnames.c
View file

@ -165,8 +165,8 @@ AcpiNsHandleToName (
/* Just copy the ACPI name from the Node and zero terminate it */ /* Just copy the ACPI name from the Node and zero terminate it */
NodeName = AcpiUtGetNodeName (Node); NodeName = AcpiUtGetNodeName (Node);
ACPI_MOVE_NAME (Buffer->Pointer, NodeName); ACPI_COPY_NAMESEG (Buffer->Pointer, NodeName);
((char *) Buffer->Pointer) [ACPI_NAME_SIZE] = 0; ((char *) Buffer->Pointer) [ACPI_NAMESEG_SIZE] = 0;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%4.4s\n", (char *) Buffer->Pointer)); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%4.4s\n", (char *) Buffer->Pointer));
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
@ -266,7 +266,7 @@ AcpiNsBuildNormalizedPath (
BOOLEAN NoTrailing) BOOLEAN NoTrailing)
{ {
UINT32 Length = 0, i; UINT32 Length = 0, i;
char Name[ACPI_NAME_SIZE]; char Name[ACPI_NAMESEG_SIZE];
BOOLEAN DoNoTrailing; BOOLEAN DoNoTrailing;
char c, *Left, *Right; char c, *Left, *Right;
ACPI_NAMESPACE_NODE *NextNode; ACPI_NAMESPACE_NODE *NextNode;
@ -549,7 +549,7 @@ AcpiNsNormalizePathname (
{ {
/* Do one nameseg at a time */ /* Do one nameseg at a time */
for (i = 0; (i < ACPI_NAME_SIZE) && *InputPath; i++) for (i = 0; (i < ACPI_NAMESEG_SIZE) && *InputPath; i++)
{ {
if ((i == 0) || (*InputPath != '_')) /* First char is allowed to be underscore */ if ((i == 0) || (*InputPath != '_')) /* First char is allowed to be underscore */
{ {

5
drivers/bus/acpi/acpica/namespace/nsobject.c
View file

@ -244,6 +244,11 @@ AcpiNsDetachObject (
} }
} }
if (ObjDesc->Common.Type == ACPI_TYPE_REGION)
{
AcpiUtRemoveAddressRange(ObjDesc->Region.SpaceId, Node);
}
/* Clear the Node entry in all cases */ /* Clear the Node entry in all cases */
Node->Object = NULL; Node->Object = NULL;

2
drivers/bus/acpi/acpica/namespace/nsparse.c
View file

@ -257,7 +257,7 @@ AcpiNsOneCompleteParse (
/* Found OSDT table, enable the namespace override feature */ /* Found OSDT table, enable the namespace override feature */
if (ACPI_COMPARE_NAME(Table->Signature, ACPI_SIG_OSDT) && if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) &&
PassNumber == ACPI_IMODE_LOAD_PASS1) PassNumber == ACPI_IMODE_LOAD_PASS1)
{ {
WalkState->NamespaceOverride = TRUE; WalkState->NamespaceOverride = TRUE;

2
drivers/bus/acpi/acpica/namespace/nsrepair.c
View file

@ -362,7 +362,7 @@ AcpiNsMatchSimpleRepair (
ThisName = AcpiObjectRepairInfo; ThisName = AcpiObjectRepairInfo;
while (ThisName->ObjectConverter) while (ThisName->ObjectConverter)
{ {
if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name)) if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name))
{ {
/* Check if we can actually repair this name/type combination */ /* Check if we can actually repair this name/type combination */

4
drivers/bus/acpi/acpica/namespace/nsrepair2.c
View file

@ -61,7 +61,7 @@ ACPI_STATUS (*ACPI_REPAIR_FUNCTION) (
typedef struct acpi_repair_info typedef struct acpi_repair_info
{ {
char Name[ACPI_NAME_SIZE]; char Name[ACPI_NAMESEG_SIZE];
ACPI_REPAIR_FUNCTION RepairFunction; ACPI_REPAIR_FUNCTION RepairFunction;
} ACPI_REPAIR_INFO; } ACPI_REPAIR_INFO;
@ -250,7 +250,7 @@ AcpiNsMatchComplexRepair (
ThisName = AcpiNsRepairableNames; ThisName = AcpiNsRepairableNames;
while (ThisName->RepairFunction) while (ThisName->RepairFunction)
{ {
if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name)) if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name))
{ {
return (ThisName); return (ThisName);
} }

12
drivers/bus/acpi/acpica/namespace/nsutils.c
View file

@ -243,7 +243,7 @@ AcpiNsGetInternalNameLength (
} }
} }
Info->Length = (ACPI_NAME_SIZE * Info->NumSegments) + Info->Length = (ACPI_NAMESEG_SIZE * Info->NumSegments) +
4 + Info->NumCarats; 4 + Info->NumCarats;
Info->NextExternalChar = NextExternalChar; Info->NextExternalChar = NextExternalChar;
@ -335,7 +335,7 @@ AcpiNsBuildInternalName (
for (; NumSegments; NumSegments--) for (; NumSegments; NumSegments--)
{ {
for (i = 0; i < ACPI_NAME_SIZE; i++) for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{ {
if (ACPI_IS_PATH_SEPARATOR (*ExternalName) || if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
(*ExternalName == 0)) (*ExternalName == 0))
@ -364,7 +364,7 @@ AcpiNsBuildInternalName (
/* Move on the next segment */ /* Move on the next segment */
ExternalName++; ExternalName++;
Result += ACPI_NAME_SIZE; Result += ACPI_NAMESEG_SIZE;
} }
/* Terminate the string */ /* Terminate the string */
@ -613,12 +613,12 @@ AcpiNsExternalizeName (
/* Copy and validate the 4-char name segment */ /* Copy and validate the 4-char name segment */
ACPI_MOVE_NAME (&(*ConvertedName)[j], ACPI_COPY_NAMESEG (&(*ConvertedName)[j],
&InternalName[NamesIndex]); &InternalName[NamesIndex]);
AcpiUtRepairName (&(*ConvertedName)[j]); AcpiUtRepairName (&(*ConvertedName)[j]);
j += ACPI_NAME_SIZE; j += ACPI_NAMESEG_SIZE;
NamesIndex += ACPI_NAME_SIZE; NamesIndex += ACPI_NAMESEG_SIZE;
} }
} }

4
drivers/bus/acpi/acpica/namespace/nsxfname.c
View file

@ -583,8 +583,8 @@ AcpiInstallMethod (
/* Table must be a DSDT or SSDT */ /* Table must be a DSDT or SSDT */
if (!ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) && if (!ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) &&
!ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT)) !ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT))
{ {
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }

8
drivers/bus/acpi/acpica/parser/psargs.c
View file

@ -206,21 +206,21 @@ AcpiPsGetNextNamestring (
/* Two name segments */ /* Two name segments */
End += 1 + (2 * ACPI_NAME_SIZE); End += 1 + (2 * ACPI_NAMESEG_SIZE);
break; break;
case AML_MULTI_NAME_PREFIX: case AML_MULTI_NAME_PREFIX:
/* Multiple name segments, 4 chars each, count in next byte */ /* Multiple name segments, 4 chars each, count in next byte */
End += 2 + (*(End + 1) * ACPI_NAME_SIZE); End += 2 + (*(End + 1) * ACPI_NAMESEG_SIZE);
break; break;
default: default:
/* Single name segment */ /* Single name segment */
End += ACPI_NAME_SIZE; End += ACPI_NAMESEG_SIZE;
break; break;
} }
@ -600,7 +600,7 @@ AcpiPsGetNextField (
ACPI_MOVE_32_TO_32 (&Name, ParserState->Aml); ACPI_MOVE_32_TO_32 (&Name, ParserState->Aml);
AcpiPsSetName (Field, Name); AcpiPsSetName (Field, Name);
ParserState->Aml += ACPI_NAME_SIZE; ParserState->Aml += ACPI_NAMESEG_SIZE;
ASL_CV_CAPTURE_COMMENTS_ONLY (ParserState); ASL_CV_CAPTURE_COMMENTS_ONLY (ParserState);

8
drivers/bus/acpi/acpica/resources/rsxface.c
View file

@ -717,10 +717,10 @@ AcpiWalkResources (
/* Parameter validation */ /* Parameter validation */
if (!DeviceHandle || !UserFunction || !Name || if (!DeviceHandle || !UserFunction || !Name ||
(!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) && (!ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__CRS) &&
!ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS) && !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__PRS) &&
!ACPI_COMPARE_NAME (Name, METHOD_NAME__AEI) && !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__AEI) &&
!ACPI_COMPARE_NAME (Name, METHOD_NAME__DMA))) !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__DMA)))
{ {
return_ACPI_STATUS (AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
} }

2
drivers/bus/acpi/acpica/tables/tbdata.c
View file

@ -568,7 +568,7 @@ AcpiTbVerifyTempTable (
/* If a particular signature is expected (DSDT/FACS), it must match */ /* If a particular signature is expected (DSDT/FACS), it must match */
if (Signature && if (Signature &&
!ACPI_COMPARE_NAME (&TableDesc->Signature, Signature)) !ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature))
{ {
ACPI_BIOS_ERROR ((AE_INFO, ACPI_BIOS_ERROR ((AE_INFO,
"Invalid signature 0x%X for ACPI table, expected [%s]", "Invalid signature 0x%X for ACPI table, expected [%s]",

6
drivers/bus/acpi/acpica/tables/tbfind.c
View file

@ -99,7 +99,7 @@ AcpiTbFindTable (
/* Normalize the input strings */ /* Normalize the input strings */
memset (&Header, 0, sizeof (ACPI_TABLE_HEADER)); memset (&Header, 0, sizeof (ACPI_TABLE_HEADER));
ACPI_MOVE_NAME (Header.Signature, Signature); ACPI_COPY_NAMESEG (Header.Signature, Signature);
strncpy (Header.OemId, OemId, ACPI_OEM_ID_SIZE); strncpy (Header.OemId, OemId, ACPI_OEM_ID_SIZE);
strncpy (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE); strncpy (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE);
@ -109,7 +109,7 @@ AcpiTbFindTable (
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
{ {
if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature), if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
Header.Signature, ACPI_NAME_SIZE)) Header.Signature, ACPI_NAMESEG_SIZE))
{ {
/* Not the requested table */ /* Not the requested table */
@ -137,7 +137,7 @@ AcpiTbFindTable (
/* Check for table match on all IDs */ /* Check for table match on all IDs */
if (!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->Signature, if (!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->Signature,
Header.Signature, ACPI_NAME_SIZE) && Header.Signature, ACPI_NAMESEG_SIZE) &&
(!OemId[0] || (!OemId[0] ||
!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->OemId, !memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->OemId,
Header.OemId, ACPI_OEM_ID_SIZE)) && Header.OemId, ACPI_OEM_ID_SIZE)) &&

2
drivers/bus/acpi/acpica/tables/tbinstal.c
View file

@ -166,7 +166,7 @@ AcpiTbInstallStandardTable (
*/ */
if (!Reload && if (!Reload &&
AcpiGbl_DisableSsdtTableInstall && AcpiGbl_DisableSsdtTableInstall &&
ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT)) ACPI_COMPARE_NAMESEG (&NewTableDesc.Signature, ACPI_SIG_SSDT))
{ {
ACPI_INFO (( ACPI_INFO ((
"Ignoring installation of %4.4s at %8.8X%8.8X", "Ignoring installation of %4.4s at %8.8X%8.8X",

10
drivers/bus/acpi/acpica/tables/tbprint.c
View file

@ -117,10 +117,10 @@ AcpiTbCleanupTableHeader (
memcpy (OutHeader, Header, sizeof (ACPI_TABLE_HEADER)); memcpy (OutHeader, Header, sizeof (ACPI_TABLE_HEADER));
AcpiTbFixString (OutHeader->Signature, ACPI_NAME_SIZE); AcpiTbFixString (OutHeader->Signature, ACPI_NAMESEG_SIZE);
AcpiTbFixString (OutHeader->OemId, ACPI_OEM_ID_SIZE); AcpiTbFixString (OutHeader->OemId, ACPI_OEM_ID_SIZE);
AcpiTbFixString (OutHeader->OemTableId, ACPI_OEM_TABLE_ID_SIZE); AcpiTbFixString (OutHeader->OemTableId, ACPI_OEM_TABLE_ID_SIZE);
AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAME_SIZE); AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAMESEG_SIZE);
} }
@ -145,7 +145,7 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER LocalHeader; ACPI_TABLE_HEADER LocalHeader;
if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS))
{ {
/* FACS only has signature and length fields */ /* FACS only has signature and length fields */
@ -212,8 +212,8 @@ AcpiTbVerifyChecksum (
* They are the odd tables, have no standard ACPI header and no checksum * They are the odd tables, have no standard ACPI header and no checksum
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT) || if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT) ||
ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
{ {
return (AE_OK); return (AE_OK);
} }

2
drivers/bus/acpi/acpica/tables/tbutils.c
View file

@ -395,7 +395,7 @@ AcpiTbParseRootTable (
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex); ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
if (ACPI_SUCCESS (Status) && if (ACPI_SUCCESS (Status) &&
ACPI_COMPARE_NAME ( ACPI_COMPARE_NAMESEG (
&AcpiGbl_RootTableList.Tables[TableIndex].Signature, &AcpiGbl_RootTableList.Tables[TableIndex].Signature,
ACPI_SIG_FADT)) ACPI_SIG_FADT))
{ {

4
drivers/bus/acpi/acpica/tables/tbxface.c
View file

@ -293,7 +293,7 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
{ {
if (!ACPI_COMPARE_NAME ( if (!ACPI_COMPARE_NAMESEG (
&(AcpiGbl_RootTableList.Tables[i].Signature), Signature)) &(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
{ {
continue; continue;
@ -396,7 +396,7 @@ AcpiGetTable (
{ {
TableDesc = &AcpiGbl_RootTableList.Tables[i]; TableDesc = &AcpiGbl_RootTableList.Tables[i];
if (!ACPI_COMPARE_NAME (&TableDesc->Signature, Signature)) if (!ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature))
{ {
continue; continue;
} }

10
drivers/bus/acpi/acpica/tables/tbxfload.c
View file

@ -167,7 +167,7 @@ AcpiTbLoadNamespace (
Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex]; Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
if (!AcpiGbl_RootTableList.CurrentTableCount || if (!AcpiGbl_RootTableList.CurrentTableCount ||
!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_DSDT) || !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
Status = AE_NO_ACPI_TABLES; Status = AE_NO_ACPI_TABLES;
@ -226,9 +226,9 @@ AcpiTbLoadNamespace (
Table = &AcpiGbl_RootTableList.Tables[i]; Table = &AcpiGbl_RootTableList.Tables[i];
if (!Table->Address || if (!Table->Address ||
(!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_SSDT) && (!ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_SSDT) &&
!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_PSDT) && !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_PSDT) &&
!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_OSDT)) || !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_OSDT)) ||
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
continue; continue;
@ -448,7 +448,7 @@ AcpiUnloadParentTable (
* only these types can contain AML and thus are the only types * only these types can contain AML and thus are the only types
* that can create namespace objects. * that can create namespace objects.
*/ */
if (ACPI_COMPARE_NAME ( if (ACPI_COMPARE_NAMESEG (
AcpiGbl_RootTableList.Tables[i].Signature.Ascii, AcpiGbl_RootTableList.Tables[i].Signature.Ascii,
ACPI_SIG_DSDT)) ACPI_SIG_DSDT))
{ {

2
drivers/bus/acpi/acpica/utilities/utascii.c
View file

@ -68,7 +68,7 @@ AcpiUtValidNameseg (
/* Validate each character in the signature */ /* Validate each character in the signature */
for (i = 0; i < ACPI_NAME_SIZE; i++) for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{ {
if (!AcpiUtValidNameChar (Name[i], i)) if (!AcpiUtValidNameChar (Name[i], i))
{ {

26
drivers/bus/acpi/acpica/utilities/utdecode.c
View file

@ -106,17 +106,17 @@ const UINT8 AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] =
const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] =
{ {
"SystemMemory", /* 0x00 */ "SystemMemory", /* 0x00 */
"SystemIO", /* 0x01 */ "SystemIO", /* 0x01 */
"PCI_Config", /* 0x02 */ "PCI_Config", /* 0x02 */
"EmbeddedControl", /* 0x03 */ "EmbeddedControl", /* 0x03 */
"SMBus", /* 0x04 */ "SMBus", /* 0x04 */
"SystemCMOS", /* 0x05 */ "SystemCMOS", /* 0x05 */
"PCIBARTarget", /* 0x06 */ "PCIBARTarget", /* 0x06 */
"IPMI", /* 0x07 */ "IPMI", /* 0x07 */
"GeneralPurposeIo", /* 0x08 */ "GeneralPurposeIo", /* 0x08 */
"GenericSerialBus", /* 0x09 */ "GenericSerialBus", /* 0x09 */
"PCC" /* 0x0A */ "PlatformCommChannel"/* 0x0A */
}; };
@ -308,7 +308,7 @@ AcpiUtGetNodeName (
ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) Object; ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) Object;
/* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */ /* Must return a string of exactly 4 characters == ACPI_NAMESEG_SIZE */
if (!Object) if (!Object)
{ {
@ -524,7 +524,7 @@ static const char *AcpiGbl_GenericNotify[ACPI_GENERIC_NOTIFY_MAX + 1]
/* 0B */ "System Locality Update", /* 0B */ "System Locality Update",
/* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI 6.0 */ /* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI 6.0 */
/* 0D */ "System Resource Affinity Update", /* 0D */ "System Resource Affinity Update",
/* 0E */ "Heterogeneous Memory Attributes Update" /* ACPI 6.2 */ /* 0E */ "Heterogeneous Memory Attributes Update", /* ACPI 6.2 */
/* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */ /* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */
}; };

8
drivers/bus/acpi/acpica/utilities/utmisc.c
View file

@ -106,10 +106,10 @@ AcpiUtIsAmlTable (
/* These are the only tables that contain executable AML */ /* These are the only tables that contain executable AML */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) || if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) ||
ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_PSDT) || ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_PSDT) ||
ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT) || ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT) ||
ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT) || ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) ||
ACPI_IS_OEM_SIG (Table->Signature)) ACPI_IS_OEM_SIG (Table->Signature))
{ {
return (TRUE); return (TRUE);

4
drivers/bus/acpi/acpica/utilities/utpredef.c
View file

@ -129,7 +129,7 @@ AcpiUtMatchPredefinedMethod (
ThisName = AcpiGbl_PredefinedMethods; ThisName = AcpiGbl_PredefinedMethods;
while (ThisName->Info.Name[0]) while (ThisName->Info.Name[0])
{ {
if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name)) if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name))
{ {
return (ThisName); return (ThisName);
} }
@ -266,7 +266,7 @@ AcpiUtMatchResourceName (
ThisName = AcpiGbl_ResourceNames; ThisName = AcpiGbl_ResourceNames;
while (ThisName->Info.Name[0]) while (ThisName->Info.Name[0])
{ {
if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name)) if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name))
{ {
return (ThisName); return (ThisName);
} }

6
drivers/bus/acpi/acpica/utilities/utstring.c
View file

@ -195,16 +195,16 @@ AcpiUtRepairName (
* Special case for the root node. This can happen if we get an * Special case for the root node. This can happen if we get an
* error during the execution of module-level code. * error during the execution of module-level code.
*/ */
if (ACPI_COMPARE_NAME (Name, ACPI_ROOT_PATHNAME)) if (ACPI_COMPARE_NAMESEG (Name, ACPI_ROOT_PATHNAME))
{ {
return; return;
} }
ACPI_MOVE_NAME (&OriginalName, Name); ACPI_COPY_NAMESEG (&OriginalName, Name);
/* Check each character in the name */ /* Check each character in the name */
for (i = 0; i < ACPI_NAME_SIZE; i++) for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{ {
if (AcpiUtValidNameChar (Name[i], i)) if (AcpiUtValidNameChar (Name[i], i))
{ {

2
media/doc/3rd Party Files.txt
View file

@ -95,5 +95,5 @@ Used Version: 1.6.36
Website: http://libpng.sourceforge.net/ Website: http://libpng.sourceforge.net/
Title: ACPICA Title: ACPICA
Used Version: 20190215 Used Version: 20190329
Website: https://acpica.org/ Website: https://acpica.org/