EmbeddedPkg: rename gEfiMmcHostProtocolGuid to gEmbeddedMmcHostProtocolGuid

In EDK2, identifiers carrying the EFI prefix are reserved for ones
that are defined in the UEFI or PI specifications.

Since the MMC host protocol defined in EmbeddedPkg is not the one that
the UEFI spec defines, and given the confusion around this, let's rename
it to from gEfiMmcHostProtocolGuid to gEmbeddedMmcHostProtocolGuid.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
index 365f78b306fa988cb6923938bfdee8d913734caf..ea477efcb2358def0ffcc252653953ff38fed688 100644 (file)
--- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
+++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
@@ -554,7 +554,7 @@ PL180MciDxeInitialize (
   //Publish Component Name, BlockIO protocol interfaces\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r
-                  &gEfiMmcHostProtocolGuid,         &gMciHost,\r
+                  &gEmbeddedMmcHostProtocolGuid,    &gMciHost,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
index c70377bc7cfaeac1128aae3754f5c56ac8e1ca5c..78e22f940a97300d570a6d66b45ae5290a27ca85 100644 (file)
--- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
@@ -36,7 +36,7 @@
 [Protocols]\r
   gEfiCpuArchProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
-  gEfiMmcHostProtocolGuid\r
+  gEmbeddedMmcHostProtocolGuid\r
 \r
 [Pcd]\r
   gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress\r

diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
index 68c523a99f14fabb2d4d6de5973e43ecbc010059..b95917bd7aa58ecbfd988ce857f9c44383cb3c77 100644 (file)
--- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
+++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
@@ -679,7 +679,7 @@ DwEmmcDxeInitialize (
   //Publish Component Name, BlockIO protocol interfaces\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r
-                  &gEfiMmcHostProtocolGuid,         &gMciHost,\r
+                  &gEmbeddedMmcHostProtocolGuid,    &gMciHost,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
index 21c372c5b2005f6db5f13e8354ce81b303b05f5a..cf8e2422134d6431a0e4a5c52b7602b6eed8fda0 100644 (file)
--- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
+++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
@@ -37,7 +37,7 @@
 [Protocols]\r
   gEfiCpuArchProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
-  gEfiMmcHostProtocolGuid\r
+  gEmbeddedMmcHostProtocolGuid\r
 \r
 [Pcd]\r
   gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 69922802f47394acb116a6637f6f1ea282ef3cea..7e0f692d6fc10702caeb25e3fe797d830b1bbb45 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -71,7 +71,7 @@
   gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }}\r
   gEmbeddedGpioProtocolGuid           = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }}\r
   gPeCoffLoaderProtocolGuid =  { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }\r
-  gEfiMmcHostProtocolGuid              = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}\r
+  gEmbeddedMmcHostProtocolGuid         = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}\r
   gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}\r
   gAndroidFastbootPlatformProtocolGuid =  { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}\r
   gUsbDeviceProtocolGuid =  { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7,  0x0b, 0x44 }}\r

diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h
index 9e070826805bbae0ee461bc5d4887348539e8f09..4772528cf1f72368c6cb90632154600e1e571c31 100644 (file)
--- a/EmbeddedPkg/Include/Protocol/MmcHost.h
+++ b/EmbeddedPkg/Include/Protocol/MmcHost.h
@@ -13,7 +13,7 @@
 ///\r
 /// Global ID for the MMC Host Protocol\r
 ///\r
-#define EFI_MMC_HOST_PROTOCOL_GUID \\r
+#define EMBEDDED_MMC_HOST_PROTOCOL_GUID \\r
   { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B } }\r
 \r
 #define MMC_RESPONSE_TYPE_R1        0\r
@@ -178,7 +178,7 @@ struct _EFI_MMC_HOST_PROTOCOL {
 #define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \\r
                                          Host->IsMultiBlock != NULL)\r
 \r
-extern EFI_GUID gEfiMmcHostProtocolGuid;\r
+extern EFI_GUID gEmbeddedMmcHostProtocolGuid;\r
 \r
 #endif\r
 \r

diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/MmcDxe/Mmc.c
index c6170880debdd71912755537ba8a8e3597941b41..d33f7f0a49087289cf7f641ec61816c05e287695 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c
@@ -216,7 +216,7 @@ MmcDriverBindingSupported (
   //\r
   Status = gBS->OpenProtocol (\r
                 Controller,\r
-                &gEfiMmcHostProtocolGuid,\r
+                &gEmbeddedMmcHostProtocolGuid,\r
                 (VOID **) &MmcHost,\r
                 This->DriverBindingHandle,\r
                 Controller,\r
@@ -234,7 +234,7 @@ MmcDriverBindingSupported (
   //\r
   gBS->CloseProtocol (\r
       Controller,\r
-      &gEfiMmcHostProtocolGuid,\r
+      &gEmbeddedMmcHostProtocolGuid,\r
       This->DriverBindingHandle,\r
       Controller\r
       );\r
@@ -275,7 +275,7 @@ MmcDriverBindingStart (
   //\r
   Status = gBS->OpenProtocol (\r
                 Controller,\r
-                &gEfiMmcHostProtocolGuid,\r
+                &gEmbeddedMmcHostProtocolGuid,\r
                 (VOID **) &MmcHost,\r
                 This->DriverBindingHandle,\r
                 Controller,\r
@@ -326,10 +326,10 @@ MmcDriverBindingStop (
     MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink);\r
     ASSERT(MmcHostInstance != NULL);\r
 \r
-    // Close gEfiMmcHostProtocolGuid\r
+    // Close gEmbeddedMmcHostProtocolGuid\r
     Status = gBS->CloseProtocol (\r
                 Controller,\r
-                &gEfiMmcHostProtocolGuid,\r
+                &gEmbeddedMmcHostProtocolGuid,\r
                 This->DriverBindingHandle,\r
                 Controller\r
                 );\r

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
index 67cdce6c5b4d4129a683fcc783f400c2968bb02b..7a38bb4c72e4950e596621afc50b7e1a72e71928 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
@@ -38,7 +38,7 @@
   gEfiDiskIoProtocolGuid\r
   gEfiBlockIoProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
-  gEfiMmcHostProtocolGuid\r
+  gEmbeddedMmcHostProtocolGuid\r
   gEfiDriverDiagnostics2ProtocolGuid\r
 \r
 [Depex]\r