From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=softfail (domain: citrix.com, ip: , mailfrom: anthony.perard@citrix.com) Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com []) by groups.io with SMTP; Thu, 06 Jun 2019 06:15:08 -0700 Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=SoftFail smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: SoftFail (esa1.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com is inclined to not designate 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 include:spf.citrix.com include:spf2.citrix.com include:ironport.citrix.com exists:%{i}._spf.mta.salesforce.com ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 7EQ2SAG2bHf5azKRa+VpFlLdkpKge0QrjnGKM56mV5XpmaHX63gU+RtzzahdZXVkF6FMavnGUx DrRo+HvROE2+q00eX+O7yv3/1bnru12m4X+Biy2DyLjj4DGwvChtgIPTGnDJrbhvHTjKLPyxz1 LhHOugyZQv34gWp72n/2jS2YeEiS9AO/fK4KJJX1DAY8o6sK0T5M8d6vXuUxDa0F71kGoykI3i CQBnlnrDM58ChY8IbAkHgPtHT7rmaOo+Bps48dyM6Jcr4UGJ/K7ynV2FMfgtVyI2UvEVhJimKR ttk= X-SBRS: -0.9 X-MesageID: 1407202 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,559,1557201600"; d="scan'208";a="1407202" From: "Anthony PERARD" To: CC: Ray Ni , Julien Grall , "Ard Biesheuvel" , Leif Lindholm , Laszlo Ersek , Jian J Wang , Hao A Wu , Star Zeng , Anthony PERARD Subject: [PATCH v2 1/4] MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID Date: Thu, 6 Jun 2019 14:14:56 +0100 Message-ID: <20190606131459.1464-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606131459.1464-1-anthony.perard@citrix.com> References: <20190606131459.1464-1-anthony.perard@citrix.com> MIME-Version: 1.0 Return-Path: anthony.perard@citrix.com Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 --- Notes: Suggested in: Message-ID: <7d6adf5d-baca-7e9c-68ef-2f8479bbd902@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 #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} }, -- Anthony PERARD