From e017213698374e01225f641ba0917516d8e91427 Mon Sep 17 00:00:00 2001 From: Robert Moore Date: Fri, 8 Sep 2017 12:49:27 -0700 Subject: [PATCH] Rename AE_AML_INFINITE_LOOP exception More appropriately renamed to AE_AML_LOOP_TIMEOUT, now that a real timer is used for the implementation. --- source/components/dispatcher/dscontrol.c | 2 +- source/include/acexcep.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/components/dispatcher/dscontrol.c b/source/components/dispatcher/dscontrol.c index 3671749f6..7a06a1e67 100644 --- a/source/components/dispatcher/dscontrol.c +++ b/source/components/dispatcher/dscontrol.c @@ -336,7 +336,7 @@ AcpiDsExecEndControlOp ( if (ACPI_TIME_AFTER (AcpiOsGetTimer (), ControlState->Control.LoopTimeout)) { - Status = AE_AML_INFINITE_LOOP; + Status = AE_AML_LOOP_TIMEOUT; break; } diff --git a/source/include/acexcep.h b/source/include/acexcep.h index d808f2751..21db48dcb 100644 --- a/source/include/acexcep.h +++ b/source/include/acexcep.h @@ -309,7 +309,7 @@ typedef struct acpi_exception_info #define AE_AML_CIRCULAR_REFERENCE EXCEP_AML (0x001E) #define AE_AML_BAD_RESOURCE_LENGTH EXCEP_AML (0x001F) #define AE_AML_ILLEGAL_ADDRESS EXCEP_AML (0x0020) -#define AE_AML_INFINITE_LOOP EXCEP_AML (0x0021) +#define AE_AML_LOOP_TIMEOUT EXCEP_AML (0x0021) #define AE_AML_UNINITIALIZED_NODE EXCEP_AML (0x0022) #define AE_AML_TARGET_TYPE EXCEP_AML (0x0023) @@ -441,7 +441,7 @@ static const ACPI_EXCEPTION_INFO AcpiGbl_ExceptionNames_Aml[] = EXCEP_TXT ("AE_AML_CIRCULAR_REFERENCE", "Two references refer to each other"), EXCEP_TXT ("AE_AML_BAD_RESOURCE_LENGTH", "The length of a Resource Descriptor in the AML is incorrect"), EXCEP_TXT ("AE_AML_ILLEGAL_ADDRESS", "A memory, I/O, or PCI configuration address is invalid"), - EXCEP_TXT ("AE_AML_INFINITE_LOOP", "An apparent infinite AML While loop, method was aborted"), + EXCEP_TXT ("AE_AML_LOOP_TIMEOUT", "An AML While loop exceeded the maximum execution time"), EXCEP_TXT ("AE_AML_UNINITIALIZED_NODE", "A namespace node is uninitialized or unresolved"), EXCEP_TXT ("AE_AML_TARGET_TYPE", "A target operand of an incorrect type was encountered") };