From: "Eric Jin" <eric.jin@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Jin, Eric" <eric.jin@intel.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>,
Stephano Cetola <stephano.cetola@linux.intel.com>
Subject: Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID
Date: Wed, 25 Sep 2019 01:45:06 +0000 [thread overview]
Message-ID: <DA72DC7456565B47808A57108259571F63818C8B@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <15C740071DBF5F91.14164@groups.io>
Pushed at 992d2b554142f9aa1f63fca6b2c4408049011534
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Eric Jin
Sent: Tuesday, September 24, 2019 10:50 AM
To: Heinrich Schuchardt <xypron.glpk@gmx.de>; EDK II Development <devel@edk2.groups.io>
Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>
Subject: Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID
Reviewed-by: Eric Jin <eric.jin@intel.com>
-----Original Message-----
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Sent: Friday, September 20, 2019 7:07 PM
To: EDK II Development <devel@edk2.groups.io>
Cc: Jin, Eric <eric.jin@intel.com>; Supreeth Venkatesh <supreeth.venkatesh@arm.com>; Stephano Cetola <stephano.cetola@linux.intel.com>; Heinrich Schuchardt <xypron.glpk@gmx.de>
Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1802
The protocol identified by EFI_UNICODE_COLLATION_PROTOCOL_GUID is deprecated. Use the protocol identified by EFI_UNICODE_COLLATION_PROTOCOL2_GUID instead. Both protocols only differ in the values for the SupportedLanguages field.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c | 2 +-
uefi-sct/SctPkg/Library/SctLib/Guid.c | 2 +-
uefi-sct/SctPkg/Library/SctLib/Init.c | 6 +++---
uefi-sct/SctPkg/Library/SctLib/SctLib.inf | 2 +-
.../BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c b/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c
index cb5a7c97..3265ac82 100644
--- a/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c
+++ b/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c
@@ -38,7 +38,7 @@ EFI_GUID gEfiLoadFileProtocolGuid = { 0x56EC3091, 0x954C, 0x11D2, { 0x8E, 0x3F, EFI_GUID gEfiDeviceIoProtocolGuid = { 0xAF6AC311, 0x84C3, 0x11D2, { 0x8E, 0x3C, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileInfoGuid = { 0x09576E92, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileSystemInfoGuid = { 0x09576E93, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};-EFI_GUID gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};+EFI_GUID gEfiUnicodeCollation2ProtocolGuid = {0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}; EFI_GUID gEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }}; EFI_GUID gEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}; EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid = { 0xE18541CD, 0xF755, 0x4F73, { 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 }};diff --git a/uefi-sct/SctPkg/Library/SctLib/Guid.c b/uefi-sct/SctPkg/Library/SctLib/Guid.c
index d0391060..f318725b 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Guid.c
+++ b/uefi-sct/SctPkg/Library/SctLib/Guid.c
@@ -117,7 +117,7 @@ struct {
{ &gEfiFileInfoGuid, L"GenFileInfo" }, { &gEfiFileSystemInfoGuid, L"FileSysInfo" }, - { &gEfiUnicodeCollationProtocolGuid, L"UnicodeCollation" },+ { &gEfiUnicodeCollation2ProtocolGuid, L"UnicodeCollation2" }, { &gEfiSerialIoProtocolGuid, L"serialio" }, { &gEfiSimpleNetworkProtocolGuid, L"net" }, { &gEfiNetworkInterfaceIdentifierProtocolGuid, L"nii" },diff --git a/uefi-sct/SctPkg/Library/SctLib/Init.c b/uefi-sct/SctPkg/Library/SctLib/Init.c
index 7e7618eb..704636e3 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Init.c
+++ b/uefi-sct/SctPkg/Library/SctLib/Init.c
@@ -81,7 +81,7 @@ InitializeUnicodeSupport (
// If we don't know it, lookup the current language code // - SctLocateHandle (ByProtocol, &gEfiUnicodeCollationProtocolGuid, NULL, &NoHandles, &Handles);+ SctLocateHandle (ByProtocol, &gEfiUnicodeCollation2ProtocolGuid, NULL, &NoHandles, &Handles); if (!LangCode || !NoHandles) { goto Done; }@@ -91,7 +91,7 @@ InitializeUnicodeSupport (
// for (Index=0; Index < NoHandles; Index++) {- Status = tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollationProtocolGuid, (VOID**)&Ui);+ Status = tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollation2ProtocolGuid, (VOID**)&Ui); if (EFI_ERROR(Status)) { continue; }@@ -180,7 +180,7 @@ SctInitializeLib (
// // LangCode = LibGetVariable (VarLanguage, &EfiGlobalVariable); // InitializeUnicodeSupport (LangCode);- InitializeUnicodeSupport ("eng");+ InitializeUnicodeSupport ("en"); if (LangCode) { SctFreePool (LangCode); }diff --git a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf b/uefi-sct/SctPkg/Library/SctLib/SctLib.inf
index ff6ce579..cd354ffe 100644
--- a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf
+++ b/uefi-sct/SctPkg/Library/SctLib/SctLib.inf
@@ -108,7 +108,7 @@
gEfiSimpleNetworkProtocolGuid gEfiSimpleTextInProtocolGuid gEfiSimpleTextOutProtocolGuid- gEfiUnicodeCollationProtocolGuid+ gEfiUnicodeCollation2ProtocolGuid gEfiDriverBindingProtocolGuid gEfiDriverConfigurationProtocolGuid gEfiDriverDiagnosticsProtocolGuiddiff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
index b3f1b8c5..09d89772 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTes
+++ t/EfiCompliantBBTestPlatform_uefi.c
@@ -1180,7 +1180,7 @@ CheckBootFromDiskProtocols (
// Check the UNICODE_COLLATION protocol // Status = gtBS->LocateProtocol (- &gEfiUnicodeCollationProtocolGuid,+ &gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID **) &Interface );@@ -3851,4 +3851,4 @@ CheckIPSecProtocols (
); return EFI_SUCCESS;-}
\ No newline at end of file
+}
--
2.23.0
prev parent reply other threads:[~2019-09-25 1:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 11:06 [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Heinrich Schuchardt
2019-09-24 2:49 ` Eric Jin
[not found] ` <15C740071DBF5F91.14164@groups.io>
2019-09-25 1:45 ` Eric Jin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DA72DC7456565B47808A57108259571F63818C8B@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox