This patch was originally merged in edk2 master at
6814256083a90ef218e7ae240e51922045175df1. However, this was
later reverted at
db8382ef5e44bd07654fb4726b77f3c329210561
as it was merged during the Soft Feature Freeze for
edk2-stable201903.
Resubmitting this patch as the edk2 merge window is now open.
The DBG2_DEBUG_PORT_DDI() macro supports adding only one
Generic Base Address Register. Therefore, removed the
superfluous parameter NumReg and updated the macro to
use DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS which has
a value 1.
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>
/** A helper macro used for initializing the debug port device\r
information structure.\r
\r
/** 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
@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
SubType, \\r
UartBase, \\r
UartAddrLen, \\r
SubType, \\r
UartBase, \\r
UartAddrLen, \\r
/* UINT16 Length */ \\r
sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \\r
/* UINT8 NumberofGenericAddressRegisters */ \\r
/* UINT16 Length */ \\r
sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \\r
/* UINT8 NumberofGenericAddressRegisters */ \\r
+ DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \\r
/* UINT16 NameSpaceStringLength */ \\r
DBG2_NAMESPACESTRING_FIELD_SIZE, \\r
/* UINT16 NameSpaceStringOffset */ \\r
/* UINT16 NameSpaceStringLength */ \\r
DBG2_NAMESPACESTRING_FIELD_SIZE, \\r
/* UINT16 NameSpaceStringOffset */ \\r
* Debug port 1\r
*/\r
DBG2_DEBUG_PORT_DDI (\r
* 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
0, // {Template}: Serial Port Subtype\r
0, // {Template}: Serial Port Base Address\r
PL011_UART_LENGTH,\r