From db8382ef5e44bd07654fb4726b77f3c329210561 Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Mon, 25 Feb 2019 20:36:48 +0000 Subject: [PATCH] Revert "DynamicTablesPkg: DGB2: Update DBG2_DEBUG_PORT_DDI" This reverts commit 6814256083a90ef218e7ae240e51922045175df1. Reverting this patch as Soft Feature Freeze for edk2-stable201903 started on 22 Feb 2019. Cc: Laszlo Ersek Cc: Alexei Fedorov Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- .../Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c index 90380f48da..697cfc46ab 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c @@ -97,12 +97,14 @@ typedef struct { /** A helper macro used for initializing the debug port device information structure. + @param [in] NumReg The number of generic address registers. @param [in] SubType The DBG Port SubType. @param [in] UartBase The UART port base address. @param [in] UartAddrLen The UART port address range length. @param [in] UartNameStr The UART port name string. **/ #define DBG2_DEBUG_PORT_DDI( \ + NumReg, \ SubType, \ UartBase, \ UartAddrLen, \ @@ -114,7 +116,7 @@ typedef struct { /* UINT16 Length */ \ sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \ /* UINT8 NumberofGenericAddressRegisters */ \ - DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \ + NumReg, \ /* UINT16 NameSpaceStringLength */ \ DBG2_NAMESPACESTRING_FIELD_SIZE, \ /* UINT16 NameSpaceStringOffset */ \ @@ -162,6 +164,7 @@ DBG2_TABLE AcpiDbg2 = { * Debug port 1 */ DBG2_DEBUG_PORT_DDI ( + DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, 0, // {Template}: Serial Port Subtype 0, // {Template}: Serial Port Base Address PL011_UART_LENGTH, -- 2.39.2