diff options
Diffstat (limited to 'sys/contrib/dev/acpica/Subsystem/Common')
11 files changed, 47 insertions, 57 deletions
diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmalloc.c b/sys/contrib/dev/acpica/Subsystem/Common/cmalloc.c index 3b8564e..d970e93 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmalloc.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmalloc.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmalloc - local memory allocation routines - * $Revision: 79 $ + * $Revision: 80 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmclib.c b/sys/contrib/dev/acpica/Subsystem/Common/cmclib.c index a35915d..70efc61 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmclib.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmclib.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmclib - Local implementation of C library functions - * $Revision: 28 $ + * $Revision: 29 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmcopy.c b/sys/contrib/dev/acpica/Subsystem/Common/cmcopy.c index 91405da..534b50e 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmcopy.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmcopy.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmcopy - Internal to external object translation utilities - * $Revision: 59 $ + * $Revision: 61 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -198,7 +198,7 @@ AcpiCmBuildExternalSimpleObject ( case ACPI_TYPE_STRING: - Length = InternalObj->String.Length; + Length = InternalObj->String.Length + 1; ExternalObj->String.Length = InternalObj->String.Length; ExternalObj->String.Pointer = (NATIVE_CHAR *) DataSpace; SourcePtr = (UINT8 *) InternalObj->String.Pointer; diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmdebug.c b/sys/contrib/dev/acpica/Subsystem/Common/cmdebug.c index 59ec1aa..9cc5371 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmdebug.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmdebug.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmdebug - Debug print routines - * $Revision: 61 $ + * $Revision: 62 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmdelete.c b/sys/contrib/dev/acpica/Subsystem/Common/cmdelete.c index 055c71c..1854715 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmdelete.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmdelete.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: cmdelete - object deletion and reference count utilities - * $Revision: 60 $ + * $Revision: 61 $ * ******************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmeval.c b/sys/contrib/dev/acpica/Subsystem/Common/cmeval.c index 7b9fefc..e5a2427 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmeval.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmeval.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmeval - Object evaluation - * $Revision: 19 $ + * $Revision: 20 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmglobal.c b/sys/contrib/dev/acpica/Subsystem/Common/cmglobal.c index 07757d5..d89b56c 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmglobal.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmglobal.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmglobal - Global variables for the ACPI subsystem - * $Revision: 112 $ + * $Revision: 113 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -287,8 +287,6 @@ ACPI_TABLE_SUPPORT AcpiGbl_AcpiTableData[NUM_ACPI_TABLES] = NATIVE_CHAR *MsgAcpiErrorBreak = "*** Break on ACPI_ERROR ***\n"; - - /***************************************************************************** * * FUNCTION: AcpiCmGetMutexName @@ -393,9 +391,6 @@ AcpiCmGetTypeName ( } - - - /* Region type decoding */ NATIVE_CHAR *AcpiGbl_RegionTypes[NUM_REGION_TYPES] = @@ -441,9 +436,6 @@ AcpiCmGetRegionName ( } - - - /* Data used in keeping track of fields */ NATIVE_CHAR *AcpiGbl_FENames[NUM_FIELD_NAMES] = @@ -453,7 +445,6 @@ NATIVE_CHAR *AcpiGbl_FENames[NUM_FIELD_NAMES] = }; /* FE = Field Element */ - NATIVE_CHAR *AcpiGbl_MatchOps[NUM_MATCH_OPS] = { "Error", @@ -492,7 +483,6 @@ NATIVE_CHAR *AcpiGbl_UpdateRules[NUM_UPDATE_RULES] = #endif - /***************************************************************************** * * FUNCTION: AcpiCmValidObjectType diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cminit.c b/sys/contrib/dev/acpica/Subsystem/Common/cminit.c index 1c5a0a9..b42ba3e 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cminit.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cminit.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cminit - Common ACPI subsystem initialization - * $Revision: 89 $ + * $Revision: 91 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -146,7 +146,7 @@ static ACPI_STATUS AcpiCmFadtRegisterError ( NATIVE_CHAR *RegisterName, - UINT64 Value) + UINT32 Value) { REPORT_ERROR ( @@ -191,28 +191,28 @@ AcpiCmValidateFadt ( if (!AcpiGbl_FADT->Pm1CntLen) { Status = AcpiCmFadtRegisterError ("PM1_CNT_LEN", - (UINT32) AcpiGbl_FADT->Pm1CntLen); + 0); } - if (!AcpiGbl_FADT->XPm1aEvtBlk.Address) + if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1aEvtBlk.Address)) { Status = AcpiCmFadtRegisterError ("PM1a_EVT_BLK", - AcpiGbl_FADT->XPm1aEvtBlk.Address); + 0); } - if (!AcpiGbl_FADT->XPm1aCntBlk.Address) + if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1aCntBlk.Address)) { Status = AcpiCmFadtRegisterError ("PM1a_CNT_BLK", - AcpiGbl_FADT->XPm1aCntBlk.Address); + 0); } - if (!AcpiGbl_FADT->XPmTmrBlk.Address) + if (!ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPmTmrBlk.Address)) { Status = AcpiCmFadtRegisterError ("PM_TMR_BLK", - AcpiGbl_FADT->XPmTmrBlk.Address); + 0); } - if ((AcpiGbl_FADT->XPm2CntBlk.Address && + if ((ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm2CntBlk.Address) && !AcpiGbl_FADT->Pm2CntLen)) { Status = AcpiCmFadtRegisterError ("PM2_CNT_LEN", @@ -228,14 +228,14 @@ AcpiCmValidateFadt ( /* length of GPE blocks must be a multiple of 2 */ - if (AcpiGbl_FADT->XGpe0Blk.Address && + if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe0Blk.Address) && (AcpiGbl_FADT->Gpe0BlkLen & 1)) { Status = AcpiCmFadtRegisterError ("GPE0_BLK_LEN", (UINT32) AcpiGbl_FADT->Gpe0BlkLen); } - if (AcpiGbl_FADT->XGpe1Blk.Address && + if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XGpe1Blk.Address) && (AcpiGbl_FADT->Gpe1BlkLen & 1)) { Status = AcpiCmFadtRegisterError ("GPE1_BLK_LEN", diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmobject.c b/sys/contrib/dev/acpica/Subsystem/Common/cmobject.c index a1a8b0e..5e0f6f4 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmobject.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmobject.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmobject - ACPI object create/delete/size/cache routines - * $Revision: 32 $ + * $Revision: 34 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -576,7 +576,7 @@ AcpiCmGetSimpleObjectSize ( case ACPI_TYPE_STRING: - Length += InternalObj->String.Length; + Length += InternalObj->String.Length + 1; break; diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmutils.c b/sys/contrib/dev/acpica/Subsystem/Common/cmutils.c index 64e08ba..662ec14 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmutils.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmutils.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: cmutils - common utility procedures - * $Revision: 21 $ + * $Revision: 22 $ * ******************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * diff --git a/sys/contrib/dev/acpica/Subsystem/Common/cmxface.c b/sys/contrib/dev/acpica/Subsystem/Common/cmxface.c index e905921..840d0d5 100644 --- a/sys/contrib/dev/acpica/Subsystem/Common/cmxface.c +++ b/sys/contrib/dev/acpica/Subsystem/Common/cmxface.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: cmxface - External interfaces for "global" ACPI functions - * $Revision: 55 $ + * $Revision: 57 $ * *****************************************************************************/ @@ -9,8 +9,8 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, Intel Corp. All rights - * reserved. + * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp. + * All rights reserved. * * 2. License * @@ -153,7 +153,7 @@ AcpiInitializeSubsystem ( FUNCTION_TRACE ("AcpiInitializeSubsystem"); DEBUG_PRINT_RAW (ACPI_OK, - ("ACPI Subsystem version [%s]\n", ACPI_CA_VERSION)); + ("ACPI: Core Subsystem version [%s]\n", ACPI_CA_VERSION)); DEBUG_PRINT (ACPI_INFO, ("Initializing ACPI Subsystem...\n")); |