From 469d09d6b25f4ac83dd4ed511db45795aa09d45b Mon Sep 17 00:00:00 2001 From: Jeshua Smith Date: Fri, 3 May 2024 14:25:37 -0700 Subject: DynamicTablesPkg: AmlLib CONST cleanup Several input strings to AmlLib APIs are treated as CONST but were missing the CONST keyword, requiring their callers to create unnecessary r/w copies of r/o input strings. This change properly marks these input strings as CONST. Signed-off-by: Jeshua Smith Reviewed-by: Jeff Brasen --- DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h | 12 ++++++------ DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c | 2 +- DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c | 10 +++++----- .../Library/Common/AmlLib/NameSpace/AmlNameSpace.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h index 4427ab6..7c13073 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -339,7 +339,7 @@ EFI_STATUS EFIAPI AmlFindNode ( IN AML_NODE_HANDLE ReferenceNode, - IN CHAR8 *AslPath, + IN CONST CHAR8 *AslPath, OUT AML_NODE_HANDLE *OutNode ); @@ -374,7 +374,7 @@ EFI_STATUS EFIAPI AmlDeviceOpUpdateName ( IN AML_OBJECT_NODE_HANDLE DeviceOpNode, - IN CHAR8 *NewNameString + IN CONST CHAR8 *NewNameString ); /** Update an integer value defined by a NameOp object node. @@ -1090,7 +1090,7 @@ EFI_STATUS EFIAPI AmlCodeGenNameString ( IN CONST CHAR8 *NameString, - IN CHAR8 *String, + IN CONST CHAR8 *String, IN AML_NODE_HANDLE ParentNode OPTIONAL, OUT AML_OBJECT_NODE_HANDLE *NewObjectNode OPTIONAL ); @@ -1613,7 +1613,7 @@ AmlAddLpiState ( IN UINT64 Integer OPTIONAL, IN EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE *ResidencyCounterRegister OPTIONAL, IN EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE *UsageCounterRegister OPTIONAL, - IN CHAR8 *StateName OPTIONAL, + IN CONST CHAR8 *StateName OPTIONAL, IN AML_OBJECT_NODE_HANDLE LpiNode ); @@ -1668,7 +1668,7 @@ AmlAddDeviceDataDescriptorPackage ( EFI_STATUS EFIAPI AmlAddNameIntegerPackage ( - IN CHAR8 *Name, + IN CONST CHAR8 *Name, IN UINT64 Value, IN AML_OBJECT_NODE_HANDLE PackageNode ); @@ -1739,7 +1739,7 @@ AmlCreateCpcNode ( EFI_STATUS EFIAPI AmlAddNameStringToNamedPackage ( - IN CHAR8 *NameString, + IN CONST CHAR8 *NameString, IN AML_OBJECT_NODE_HANDLE NamedNode ); diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c b/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c index 9f162ab..41643d5 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c @@ -40,7 +40,7 @@ EFI_STATUS EFIAPI AmlDeviceOpUpdateName ( IN AML_OBJECT_NODE_HANDLE DeviceOpNode, - IN CHAR8 *NewNameString + IN CONST CHAR8 *NewNameString ) { EFI_STATUS Status; diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c index 89fa4e0..f433a46 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -139,7 +139,7 @@ STATIC EFI_STATUS EFIAPI AmlCodeGenString ( - IN CHAR8 *String, + IN CONST CHAR8 *String, OUT AML_OBJECT_NODE **NewObjectNode ) { @@ -664,7 +664,7 @@ EFI_STATUS EFIAPI AmlCodeGenNameString ( IN CONST CHAR8 *NameString, - IN CHAR8 *String, + IN CONST CHAR8 *String, IN AML_NODE_HEADER *ParentNode OPTIONAL, OUT AML_OBJECT_NODE **NewObjectNode OPTIONAL ) @@ -2615,7 +2615,7 @@ AmlAddLpiState ( IN UINT64 Integer OPTIONAL, IN EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE *ResidencyCounterRegister OPTIONAL, IN EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE *UsageCounterRegister OPTIONAL, - IN CHAR8 *StateName OPTIONAL, + IN CONST CHAR8 *StateName OPTIONAL, IN AML_OBJECT_NODE_HANDLE LpiNode ) { @@ -3204,7 +3204,7 @@ error_handler: EFI_STATUS EFIAPI AmlAddNameIntegerPackage ( - IN CHAR8 *Name, + IN CONST CHAR8 *Name, IN UINT64 Value, IN AML_OBJECT_NODE_HANDLE PackageNode ) @@ -3800,7 +3800,7 @@ error_handler: EFI_STATUS EFIAPI AmlAddNameStringToNamedPackage ( - IN CHAR8 *NameString, + IN CONST CHAR8 *NameString, IN AML_OBJECT_NODE_HANDLE NamedNode ) { diff --git a/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c b/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c index 9104b78..e871afe 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c @@ -1234,7 +1234,7 @@ EFI_STATUS EFIAPI AmlBuildAbsoluteAmlPath ( IN AML_NODE_HEADER *ReferenceNode, - IN CHAR8 *AslPath, + IN CONST CHAR8 *AslPath, IN OUT AML_STREAM *RawAmlAbsSearchPathBStream ) { @@ -1373,7 +1373,7 @@ EFI_STATUS EFIAPI AmlFindNode ( IN AML_NODE_HEADER *ReferenceNode, - IN CHAR8 *AslPath, + IN CONST CHAR8 *AslPath, OUT AML_NODE_HEADER **OutNode ) { -- cgit v1.1