diff options
author | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-06 14:14:56 +0100 |
---|---|---|
committer | Laszlo Ersek <lersek@redhat.com> | 2019-06-14 21:26:28 +0200 |
commit | cf78c9d18a81cb289fe1bfaebf07c164da6c520f (patch) | |
tree | 3e111bf42a5f8e9dc947ca5d5ddc09030eb15a33 | |
parent | b0663641c977f97bef785c86978603c3a31a3d1c (diff) | |
download | edk2-cf78c9d18a81cb289fe1bfaebf07c164da6c520f.zip edk2-cf78c9d18a81cb289fe1bfaebf07c164da6c520f.tar.gz edk2-cf78c9d18a81cb289fe1bfaebf07c164da6c520f.tar.bz2 |
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 <lersek@redhat.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20190606131459.1464-2-anthony.perard@citrix.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-rw-r--r-- | MdeModulePkg/Include/Guid/SerialPortLibVendor.h | 19 | ||||
-rw-r--r-- | MdeModulePkg/MdeModulePkg.dec | 3 | ||||
-rw-r--r-- | MdeModulePkg/Universal/SerialDxe/SerialDxe.inf | 1 | ||||
-rw-r--r-- | MdeModulePkg/Universal/SerialDxe/SerialIo.c | 3 |
4 files changed, 25 insertions, 1 deletions
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 <Protocol/SerialIo.h>
#include <Protocol/DevicePath.h>
+#include <Guid/SerialPortLibVendor.h>
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} },
|