SerialPortParser is a generic concept and can be used by other architectures. Hence, rename to reflect it is common and updates the consumers.
Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Pierre Gondois <pierre.gond...@arm.com> Cc: Sami Mujawar <sami.muja...@arm.com> Signed-off-by: Sunil V L <suni...@ventanamicro.com> --- .../FdtHwInfoParserLib/FdtHwInfoParserLib.inf | 4 ++-- ...rmSerialPortParser.h => SerialPortParser.h} | 8 ++++---- .../Arm/ArmFdtHwInfoParser.c | 2 +- ...rmSerialPortParser.c => SerialPortParser.c} | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/{ArmSerialPortParser.h => SerialPortParser.h} (89%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/{ArmSerialPortParser.c => SerialPortParser.c} (94%) diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf index 55ec7d97fa18..d3010af527c1 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf @@ -24,8 +24,8 @@ [Sources] FdtUtility.h Pci/PciConfigSpaceParser.c Pci/PciConfigSpaceParser.h - Serial/ArmSerialPortParser.c - Serial/ArmSerialPortParser.h + Serial/SerialPortParser.c + Serial/SerialPortParser.h [Sources.ARM, Sources.AARCH64] Arm/ArmFdtHwInfoParser.c diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.h similarity index 89% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.h index b3e227472772..e5f151ded329 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.h @@ -1,5 +1,5 @@ /** @file - Arm Serial Port Parser. + Serial Port Parser. Copyright (c) 2021, ARM Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -9,8 +9,8 @@ - linux/Documentation/devicetree/bindings/serial/8250.txt **/ -#ifndef ARM_SERIAL_PORT_PARSER_H_ -#define ARM_SERIAL_PORT_PARSER_H_ +#ifndef SERIAL_PORT_PARSER_H_ +#define SERIAL_PORT_PARSER_H_ /** SerialPort dispatcher. @@ -44,4 +44,4 @@ SerialPortDispatcher ( IN INT32 FdtBranch ); -#endif // ARM_SERIAL_PORT_PARSER_H_ +#endif // SERIAL_PORT_PARSER_H_ diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/ArmFdtHwInfoParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/ArmFdtHwInfoParser.c index 8dd6546e62f0..2700e9a2a5fe 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/ArmFdtHwInfoParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/ArmFdtHwInfoParser.c @@ -10,7 +10,7 @@ #include "Arm/GenericTimer/ArmGenericTimerParser.h" #include "Arm/Gic/ArmGicDispatcher.h" #include "Pci/PciConfigSpaceParser.h" -#include "Serial/ArmSerialPortParser.h" +#include "Serial/SerialPortParser.h" /** Ordered table of parsers/dispatchers. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.c similarity index 94% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.c index 47df82c4ba63..6d233fefa85f 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/ArmSerialPortParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Serial/SerialPortParser.c @@ -1,5 +1,5 @@ /** @file - Arm Serial Port Parser. + Serial Port Parser. Copyright (c) 2021 - 2023, Arm Limited. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -15,7 +15,7 @@ #include "CmObjectDescUtility.h" #include "FdtHwInfoParser.h" -#include "Serial/ArmSerialPortParser.h" +#include "Serial/SerialPortParser.h" /** List of "compatible" property values for serial port nodes. @@ -329,7 +329,7 @@ GetSerialConsoleNode ( STATIC EFI_STATUS EFIAPI -ArmSerialPortInfoDispatch ( +SerialPortInfoDispatch ( IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle, IN CM_ARCH_SERIAL_PORT_INFO *GenericSerialInfo, IN INT32 NodeCount, @@ -396,7 +396,7 @@ ArmSerialPortInfoDispatch ( @param [in] FdtParserHandle A handle to the parser instance. @param [in] FdtBranch When searching for DT node name, restrict the search to this Device Tree branch. - @param [in] SerialObjectId ArmNamespace Object ID for the serial port. + @param [in] SerialObjectId ArchNamespace Object ID for the serial port. @retval EFI_SUCCESS The function completed successfully. @retval EFI_ABORTED An error occurred. @@ -407,7 +407,7 @@ ArmSerialPortInfoDispatch ( STATIC EFI_STATUS EFIAPI -ArmSerialPortInfoParser ( +SerialPortInfoParser ( IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle, IN INT32 FdtBranch, IN EARCH_OBJECT_ID SerialObjectId @@ -435,7 +435,7 @@ ArmSerialPortInfoParser ( return Status; } - Status = ArmSerialPortInfoDispatch ( + Status = SerialPortInfoDispatch ( FdtParserHandle, &SerialInfo, 1, @@ -528,7 +528,7 @@ SerialPortDispatcher ( return Status; } else { // Parse the console serial-port. - Status = ArmSerialPortInfoParser ( + Status = SerialPortInfoParser ( FdtParserHandle, SerialConsoleNode, EArchObjSerialConsolePortInfo @@ -586,7 +586,7 @@ SerialPortDispatcher ( // The first serial-port node, not being the console serial-port, // will be the debug serial-port. SerialDebugNode = SerialNode; - Status = ArmSerialPortInfoParser ( + Status = SerialPortInfoParser ( FdtParserHandle, SerialDebugNode, EArchObjSerialDebugPortInfo @@ -616,7 +616,7 @@ SerialPortDispatcher ( } // for if (GenericSerialIndex > 0) { - Status = ArmSerialPortInfoDispatch ( + Status = SerialPortInfoDispatch ( FdtParserHandle, GenericSerialInfo, GenericSerialIndex, -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113471): https://edk2.groups.io/g/devel/message/113471 Mute This Topic: https://groups.io/mt/103622724/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-