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>

diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
new file mode 100644 (file)
index 0000000..887f96c
--- /dev/null
+++ b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
@@ -0,0 +1,19 @@
+/** @file\r
+  Define the SerialDxe GUID.\r
+\r
+  Copyright (c) 2019, Citrix Systems, Inc.\r
+\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+**/\r
+\r
+#ifndef __SERIAL_PORT_LIB_VENDOR_H__\r
+#define __SERIAL_PORT_LIB_VENDOR_H__\r
+\r
+#define EDKII_SERIAL_PORT_LIB_VENDOR_GUID { \\r
+          0xD3987D4B, 0x971A, 0x435F, \\r
+          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \\r
+          }\r
+\r
+extern EFI_GUID gEdkiiSerialPortLibVendorGuid;\r
+\r
+#endif // __SERIAL_PORT_LIB_VENDOR_H__\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6cba72998278d42b605ec5e3609182b5d6f2f6e7..2dee139ba3b0ae45f41a8ac56b54407efc99121f 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -396,6 +396,9 @@
   ## Include/Guid/S3StorageDeviceInitList.h\r
   gS3StorageDeviceInitListGuid = { 0x310e9b8c, 0xcf90, 0x421e, { 0x8e, 0x9b, 0x9e, 0xef, 0xb6, 0x17, 0xc8, 0xef } }\r
 \r
+  ## Include/Guid/SerialPortLibVendor.h\r
+  gEdkiiSerialPortLibVendorGuid = { 0xD3987D4B, 0x971A, 0x435F, { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } }\r
+\r
 [Ppis]\r
   ## Include/Ppi/AtaController.h\r
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}\r

diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
index 81066a26a27882e4863d4c06aaf0d13d4b15e535..b6c85b3f848ddc281bf52efce6e10320bc68133d 100644 (file)
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
@@ -22,6 +22,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r

diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
index 720a3f264aa60ccf205e78d4b9a280964ed7b347..fb816a1611fead37930b01f7fc2504b8f3550b6a 100644 (file)
--- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
+++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
@@ -16,6 +16,7 @@
 \r
 #include <Protocol/SerialIo.h>\r
 #include <Protocol/DevicePath.h>\r
+#include <Guid/SerialPortLibVendor.h>\r
 \r
 typedef struct {\r
   VENDOR_DEVICE_PATH        Guid;\r
@@ -159,7 +160,7 @@ EFI_HANDLE mSerialHandle = NULL;
 SERIAL_DEVICE_PATH mSerialDevicePath = {\r
   {\r
     { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },\r
-    EFI_CALLER_ID_GUID  // Use the driver's GUID\r
+    EDKII_SERIAL_PORT_LIB_VENDOR_GUID\r
   },\r
   {\r
     { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },\r