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 <ler...@redhat.com>
Signed-off-by: Anthony PERARD <anthony.per...@citrix.com>
---
Notes:
Suggested in: Message-ID: <7d6adf5d-baca-7e9c-68ef-2f8479bbd...@redhat.com>
MdeModulePkg/MdeModulePkg.dec | 3 +++
.../Universal/SerialDxe/SerialDxe.inf | 1 +
.../Include/Guid/SerialPortLibVendor.h | 19 +++++++++++++++++++
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/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6cba729982..2dee139ba3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -396,6 +396,9 @@ [Guids]
## 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 81066a26a2..b6c85b3f84 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
@@ -22,6 +22,7 @@ [Sources.common]
[Packages]
MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
[LibraryClasses]
UefiDriverEntryPoint
diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
new file mode 100644
index 0000000000..887f96c30a
--- /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/Universal/SerialDxe/SerialIo.c
b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
index 720a3f264a..fb816a1611 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} },
--
Anthony PERARD
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#42009): https://edk2.groups.io/g/devel/message/42009
Mute This Topic: https://groups.io/mt/31950875/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
