From cf78c9d18a81cb289fe1bfaebf07c164da6c520f Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Thu, 6 Jun 2019 14:14:56 +0100 Subject: MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID SERIAL_DXE_FILE_GUID is used in different places, create a single define that other can use. Also fix SerialDxe to actually use EDKII_SERIAL_PORT_LIB_VENDOR_GUID in the device path instead of the FILE_GUID. Suggested-by: Laszlo Ersek Signed-off-by: Anthony PERARD Message-Id: <20190606131459.1464-2-anthony.perard@citrix.com> Reviewed-by: Laszlo Ersek Reviewed-by: Hao A Wu Tested-by: Laszlo Ersek Acked-by: Ard Biesheuvel --- MdeModulePkg/Include/Guid/SerialPortLibVendor.h | 19 +++++++++++++++++++ MdeModulePkg/MdeModulePkg.dec | 3 +++ MdeModulePkg/Universal/SerialDxe/SerialDxe.inf | 1 + MdeModulePkg/Universal/SerialDxe/SerialIo.c | 3 ++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h new file mode 100644 index 0000000..887f96c --- /dev/null +++ b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h @@ -0,0 +1,19 @@ +/** @file + Define the SerialDxe GUID. + + Copyright (c) 2019, Citrix Systems, Inc. + + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#ifndef __SERIAL_PORT_LIB_VENDOR_H__ +#define __SERIAL_PORT_LIB_VENDOR_H__ + +#define EDKII_SERIAL_PORT_LIB_VENDOR_GUID { \ + 0xD3987D4B, 0x971A, 0x435F, \ + { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \ + } + +extern EFI_GUID gEdkiiSerialPortLibVendorGuid; + +#endif // __SERIAL_PORT_LIB_VENDOR_H__ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 6cba729..2dee139 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -396,6 +396,9 @@ ## Include/Guid/S3StorageDeviceInitList.h gS3StorageDeviceInitListGuid = { 0x310e9b8c, 0xcf90, 0x421e, { 0x8e, 0x9b, 0x9e, 0xef, 0xb6, 0x17, 0xc8, 0xef } } + ## Include/Guid/SerialPortLibVendor.h + gEdkiiSerialPortLibVendorGuid = { 0xD3987D4B, 0x971A, 0x435F, { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } } + [Ppis] ## Include/Ppi/AtaController.h gPeiAtaControllerPpiGuid = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }} diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf index 81066a2..b6c85b3 100644 --- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf @@ -22,6 +22,7 @@ [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/MdeModulePkg/Universal/SerialDxe/SerialIo.c index 720a3f2..fb816a1 100644 --- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c +++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c @@ -16,6 +16,7 @@ #include #include +#include typedef struct { VENDOR_DEVICE_PATH Guid; @@ -159,7 +160,7 @@ EFI_HANDLE mSerialHandle = NULL; SERIAL_DEVICE_PATH mSerialDevicePath = { { { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} }, - EFI_CALLER_ID_GUID // Use the driver's GUID + EDKII_SERIAL_PORT_LIB_VENDOR_GUID }, { { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} }, -- cgit v1.1