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 <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
index 90380f48da017b257476ee63bcc1beae5efe1d65..697cfc46abaedf34d30abf26e7ebb2b4d271822a 100644 (file)
--- 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\r
     information structure.\r
 \r
+  @param [in]  NumReg       The number of generic address registers.\r
   @param [in]  SubType      The DBG Port SubType.\r
   @param [in]  UartBase     The UART port base address.\r
   @param [in]  UartAddrLen  The UART port address range length.\r
   @param [in]  UartNameStr  The UART port name string.\r
 **/\r
 #define DBG2_DEBUG_PORT_DDI(                                          \\r
+          NumReg,                                                     \\r
           SubType,                                                    \\r
           UartBase,                                                   \\r
           UartAddrLen,                                                \\r
@@ -114,7 +116,7 @@ typedef struct {
       /* UINT16    Length */                                          \\r
       sizeof (DBG2_DEBUG_DEVICE_INFORMATION),                         \\r
       /* UINT8     NumberofGenericAddressRegisters */                 \\r
-      DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS,                       \\r
+      NumReg,                                                         \\r
       /* UINT16    NameSpaceStringLength */                           \\r
       DBG2_NAMESPACESTRING_FIELD_SIZE,                                \\r
       /* UINT16    NameSpaceStringOffset */                           \\r
@@ -162,6 +164,7 @@ DBG2_TABLE AcpiDbg2 = {
      * Debug port 1\r
      */\r
     DBG2_DEBUG_PORT_DDI (\r
+      DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS,\r
       0,                    // {Template}: Serial Port Subtype\r
       0,                    // {Template}: Serial Port Base Address\r
       PL011_UART_LENGTH,\r