diff options
Diffstat (limited to 'source/components')
| -rw-r--r-- | source/components/hardware/hwxfsleep.c | 4 | ||||
| -rw-r--r-- | source/components/namespace/nssearch.c | 10 | ||||
| -rw-r--r-- | source/components/tables/tbutils.c | 21 | ||||
| -rw-r--r-- | source/components/utilities/utclib.c | 6 | ||||
| -rw-r--r-- | source/components/utilities/utxfinit.c | 11 |
5 files changed, 23 insertions, 29 deletions
diff --git a/source/components/hardware/hwxfsleep.c b/source/components/hardware/hwxfsleep.c index 7837c6f56bab8..1642aa3e0d0d9 100644 --- a/source/components/hardware/hwxfsleep.c +++ b/source/components/hardware/hwxfsleep.c @@ -51,11 +51,13 @@ /* Local prototypes */ +#if (!ACPI_REDUCED_HARDWARE) static ACPI_STATUS AcpiHwSetFirmwareWakingVector ( ACPI_TABLE_FACS *Facs, ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_PHYSICAL_ADDRESS PhysicalAddress64); +#endif static ACPI_STATUS AcpiHwSleepDispatch ( @@ -171,7 +173,7 @@ AcpiSetFirmwareWakingVector ( if (AcpiGbl_ReducedHardware) { - return (AE_OK); + return_ACPI_STATUS (AE_OK); } if (AcpiGbl_Facs32) diff --git a/source/components/namespace/nssearch.c b/source/components/namespace/nssearch.c index c67abb59d3ffe..bdd4e8684e1a5 100644 --- a/source/components/namespace/nssearch.c +++ b/source/components/namespace/nssearch.c @@ -349,6 +349,11 @@ AcpiNsSearchAndEnter ( */ if (Flags & ACPI_NS_OVERRIDE_IF_FOUND) { + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, + "Namespace override: %4.4s pass %u type %X Owner %X\n", + ACPI_CAST_PTR(char, &TargetName), InterpreterMode, + (*ReturnNode)->Type, WalkState->OwnerId)); + AcpiNsDeleteChildren (*ReturnNode); if (AcpiGbl_RuntimeNamespaceOverride) { @@ -361,11 +366,6 @@ AcpiNsSearchAndEnter ( AcpiNsRemoveNode (*ReturnNode); *ReturnNode = ACPI_ENTRY_NOT_FOUND; } - - ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, - "Namespace override: %4.4s pass %u type %X Owner %X\n", - ACPI_CAST_PTR(char, &TargetName), InterpreterMode, - (*ReturnNode)->Type, WalkState->OwnerId)); } /* Return an error if we don't expect to find the object */ diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c index 79dde9ac9735b..df1e053fbfe8c 100644 --- a/source/components/tables/tbutils.c +++ b/source/components/tables/tbutils.c @@ -76,13 +76,6 @@ AcpiTbInitializeFacs ( void) { - /* If there is no FACS, just continue. There was already an error msg */ - - if (!AcpiGbl_FACS) - { - return (AE_OK); - } - /* If Hardware Reduced flag is set, there is no FACS */ if (AcpiGbl_ReducedHardware) @@ -95,20 +88,18 @@ AcpiTbInitializeFacs ( ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER, &AcpiGbl_Facs32)); (void) AcpiGetTableByIndex (ACPI_TABLE_INDEX_X_FACS, ACPI_CAST_INDIRECT_PTR (ACPI_TABLE_HEADER, &AcpiGbl_Facs64)); - if (!AcpiGbl_Facs32 && !AcpiGbl_Facs64) - { - return (AE_NO_MEMORY); - } - if (AcpiGbl_Use32BitFacsAddresses) + if (AcpiGbl_Facs64 && (!AcpiGbl_Facs32 || !AcpiGbl_Use32BitFacsAddresses)) { - AcpiGbl_FACS = AcpiGbl_Facs32 ? AcpiGbl_Facs32 : AcpiGbl_Facs64; + AcpiGbl_FACS = AcpiGbl_Facs64; } - else + else if (AcpiGbl_Facs32) { - AcpiGbl_FACS = AcpiGbl_Facs64 ? AcpiGbl_Facs64 : AcpiGbl_Facs32; + AcpiGbl_FACS = AcpiGbl_Facs32; } + /* If there is no FACS, just continue. There was already an error msg */ + return (AE_OK); } #endif /* !ACPI_REDUCED_HARDWARE */ diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index 6e3e9b4eb5b2a..a93ed867a4d8a 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -64,7 +64,6 @@ * instead of the functions in this module. */ - /******************************************************************************* * * Functions implemented in this module: @@ -88,7 +87,6 @@ * ******************************************************************************/ - #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utclib") @@ -772,13 +770,13 @@ tolower ( /******************************************************************************* * - * FUNCTION: is* functions + * FUNCTION: is* function array * * DESCRIPTION: is* functions use the ctype table below * ******************************************************************************/ -const UINT8 _acpi_ctype[257] = { +const UINT8 AcpiGbl_Ctypes[257] = { _ACPI_CN, /* 0x00 0 NUL */ _ACPI_CN, /* 0x01 1 SOH */ _ACPI_CN, /* 0x02 2 STX */ diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c index cd43870b6ee99..701b171f68e2c 100644 --- a/source/components/utilities/utxfinit.c +++ b/source/components/utilities/utxfinit.c @@ -194,11 +194,14 @@ AcpiEnableSubsystem ( * Obtain a permanent mapping for the FACS. This is required for the * Global Lock and the Firmware Waking Vector */ - Status = AcpiTbInitializeFacs (); - if (ACPI_FAILURE (Status)) + if (!(Flags & ACPI_NO_FACS_INIT)) { - ACPI_WARNING ((AE_INFO, "Could not map the FACS table")); - return_ACPI_STATUS (Status); + Status = AcpiTbInitializeFacs (); + if (ACPI_FAILURE (Status)) + { + ACPI_WARNING ((AE_INFO, "Could not map the FACS table")); + return_ACPI_STATUS (Status); + } } #endif /* !ACPI_REDUCED_HARDWARE */ |