diff options
Diffstat (limited to 'source/components/utilities')
33 files changed, 17 insertions, 62 deletions
diff --git a/source/components/utilities/utaddress.c b/source/components/utilities/utaddress.c index 8de363efa136..05b011c70e57 100644 --- a/source/components/utilities/utaddress.c +++ b/source/components/utilities/utaddress.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTADDRESS_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utalloc.c b/source/components/utilities/utalloc.c index c6c29e996667..0a58bca7bdb4 100644 --- a/source/components/utilities/utalloc.c +++ b/source/components/utilities/utalloc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTALLOC_C__ - #include "acpi.h" #include "accommon.h" #include "acdebug.h" diff --git a/source/components/utilities/utbuffer.c b/source/components/utilities/utbuffer.c index a946aabbe866..95f005a4541a 100644 --- a/source/components/utilities/utbuffer.c +++ b/source/components/utilities/utbuffer.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTBUFFER_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utcache.c b/source/components/utilities/utcache.c index 51b8bde0b45c..182868fb82c8 100644 --- a/source/components/utilities/utcache.c +++ b/source/components/utilities/utcache.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTCACHE_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index 7fbcaee9351f..9d47d3a70702 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __CMCLIB_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utcopy.c b/source/components/utilities/utcopy.c index 6ab870924a29..eae39ebfdd7f 100644 --- a/source/components/utilities/utcopy.c +++ b/source/components/utilities/utcopy.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTCOPY_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c index 973d4ec66cb1..948dacc4a4dd 100644 --- a/source/components/utilities/utdebug.c +++ b/source/components/utilities/utdebug.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDEBUG_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/utilities/utdecode.c b/source/components/utilities/utdecode.c index 1666a36b254f..d6964803e211 100644 --- a/source/components/utilities/utdecode.c +++ b/source/components/utilities/utdecode.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDECODE_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c index 9e4c79b95ac3..bd30caccd5a3 100644 --- a/source/components/utilities/utdelete.c +++ b/source/components/utilities/utdelete.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDELETE_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/utilities/uterror.c b/source/components/utilities/uterror.c index e08552049d14..3f123505356f 100644 --- a/source/components/utilities/uterror.c +++ b/source/components/utilities/uterror.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTERROR_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/uteval.c b/source/components/utilities/uteval.c index afa0a267cf07..affbdd686e85 100644 --- a/source/components/utilities/uteval.c +++ b/source/components/utilities/uteval.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTEVAL_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utexcep.c b/source/components/utilities/utexcep.c index 550719cfe145..5092512a1031 100644 --- a/source/components/utilities/utexcep.c +++ b/source/components/utilities/utexcep.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTEXCEP_C__ #define EXPORT_ACPI_INTERFACES #define ACPI_DEFINE_EXCEPTION_TABLE diff --git a/source/components/utilities/utglobal.c b/source/components/utilities/utglobal.c index 3504348d4ee2..f55c15816d1d 100644 --- a/source/components/utilities/utglobal.c +++ b/source/components/utilities/utglobal.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTGLOBAL_C__ #define EXPORT_ACPI_INTERFACES #define DEFINE_ACPI_GLOBALS diff --git a/source/components/utilities/uthex.c b/source/components/utilities/uthex.c index e71cacdbc96c..d2e147d75b41 100644 --- a/source/components/utilities/uthex.c +++ b/source/components/utilities/uthex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTHEX_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c index 70a27d0ad2a7..b39d676691d3 100644 --- a/source/components/utilities/utids.c +++ b/source/components/utilities/utids.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTIDS_C__ - #include "acpi.h" #include "accommon.h" #include "acinterp.h" diff --git a/source/components/utilities/utinit.c b/source/components/utilities/utinit.c index 8e11c516751a..14336d447f9a 100644 --- a/source/components/utilities/utinit.c +++ b/source/components/utilities/utinit.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTINIT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utlock.c b/source/components/utilities/utlock.c index 7ac315fe3e61..0c652627ad86 100644 --- a/source/components/utilities/utlock.c +++ b/source/components/utilities/utlock.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTLOCK_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utmath.c b/source/components/utilities/utmath.c index 51393353b173..af20e53dc57e 100644 --- a/source/components/utilities/utmath.c +++ b/source/components/utilities/utmath.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMATH_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index de2673c6c7d3..998c0419898e 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMISC_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utmutex.c b/source/components/utilities/utmutex.c index 8fc977a63f50..586391cdce03 100644 --- a/source/components/utilities/utmutex.c +++ b/source/components/utilities/utmutex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTMUTEX_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c index 263ba59caf89..84e0546b41a4 100644 --- a/source/components/utilities/utobject.c +++ b/source/components/utilities/utobject.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOBJECT_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utosi.c b/source/components/utilities/utosi.c index 286fe67a6e31..93ebc73257d3 100644 --- a/source/components/utilities/utosi.c +++ b/source/components/utilities/utosi.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOSI_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utownerid.c b/source/components/utilities/utownerid.c index 91943501241d..c4681d27c314 100644 --- a/source/components/utilities/utownerid.c +++ b/source/components/utilities/utownerid.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTOWNERID_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/utpredef.c b/source/components/utilities/utpredef.c index d8442f6898ca..fd7d2fe11871 100644 --- a/source/components/utilities/utpredef.c +++ b/source/components/utilities/utpredef.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTPREDEF_C__ - #include "acpi.h" #include "accommon.h" #include "acpredef.h" diff --git a/source/components/utilities/utresrc.c b/source/components/utilities/utresrc.c index af077aec8215..f6fc8b90cd92 100644 --- a/source/components/utilities/utresrc.c +++ b/source/components/utilities/utresrc.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTRESRC_C__ - #include "acpi.h" #include "accommon.h" #include "acresrc.h" @@ -300,7 +298,7 @@ const char *AcpiGbl_BpbDecode[] = const char *AcpiGbl_SbDecode[] = { - "StopBitsNone", + "StopBitsZero", "StopBitsOne", "StopBitsOnePlusHalf", "StopBitsTwo" diff --git a/source/components/utilities/utstate.c b/source/components/utilities/utstate.c index 12de2731932f..bb178016f5e8 100644 --- a/source/components/utilities/utstate.c +++ b/source/components/utilities/utstate.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTSTATE_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utstring.c b/source/components/utilities/utstring.c index 2fa7710725dc..225cf8635368 100644 --- a/source/components/utilities/utstring.c +++ b/source/components/utilities/utstring.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTSTRING_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/source/components/utilities/uttrack.c b/source/components/utilities/uttrack.c index ac9675846ea2..80ecc3234aec 100644 --- a/source/components/utilities/uttrack.c +++ b/source/components/utilities/uttrack.c @@ -52,8 +52,6 @@ * occurs in the body of AcpiUtFree. */ -#define __UTTRACK_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utuuid.c b/source/components/utilities/utuuid.c index ebf03231e4f8..f97fc8ec088c 100644 --- a/source/components/utilities/utuuid.c +++ b/source/components/utilities/utuuid.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTUUID_C__ - #include "acpi.h" #include "accommon.h" diff --git a/source/components/utilities/utxface.c b/source/components/utilities/utxface.c index dedeab39b418..671622b5bca5 100644 --- a/source/components/utilities/utxface.c +++ b/source/components/utilities/utxface.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFACE_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" @@ -621,7 +620,9 @@ AcpiDecodePldBuffer ( ACPI_MOVE_32_TO_32 (&Dword, &Buffer[0]); PldInfo->Revision = ACPI_PLD_GET_REVISION (&Dword); PldInfo->IgnoreColor = ACPI_PLD_GET_IGNORE_COLOR (&Dword); - PldInfo->Color = ACPI_PLD_GET_COLOR (&Dword); + PldInfo->Red = ACPI_PLD_GET_RED (&Dword); + PldInfo->Green = ACPI_PLD_GET_GREEN (&Dword); + PldInfo->Blue = ACPI_PLD_GET_BLUE (&Dword); /* Second 32-bit DWord */ diff --git a/source/components/utilities/utxferror.c b/source/components/utilities/utxferror.c index 48dd79c2c58c..db6535fa5fcd 100644 --- a/source/components/utilities/utxferror.c +++ b/source/components/utilities/utxferror.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFERROR_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c index 0f1a6c3a9a87..2dc5d2062ae4 100644 --- a/source/components/utilities/utxfinit.c +++ b/source/components/utilities/utxfinit.c @@ -41,7 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFINIT_C__ #define EXPORT_ACPI_INTERFACES #include "acpi.h" @@ -54,6 +53,11 @@ #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utxfinit") +/* For AcpiExec only */ +void +AeDoObjectOverrides ( + void); + /******************************************************************************* * @@ -309,6 +313,14 @@ AcpiInitializeObjects ( } } +#ifdef ACPI_EXEC_APP + /* + * This call implements the "initialization file" option for AcpiExec. + * This is the precise point that we want to perform the overrides. + */ + AeDoObjectOverrides (); +#endif + /* * Execute any module-level code that was detected during the table load * phase. Although illegal since ACPI 2.0, there are many machines that diff --git a/source/components/utilities/utxfmutex.c b/source/components/utilities/utxfmutex.c index 06245dce1bab..ac371d465787 100644 --- a/source/components/utilities/utxfmutex.c +++ b/source/components/utilities/utxfmutex.c @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTXFMUTEX_C__ - #include "acpi.h" #include "accommon.h" #include "acnamesp.h" |