diff options
| -rw-r--r-- | ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf | 2 | ||||
| -rw-r--r-- | EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 2 | ||||
| -rw-r--r-- | EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf | 2 | ||||
| -rw-r--r-- | EmbeddedPkg/EmbeddedPkg.dec | 2 | ||||
| -rw-r--r-- | EmbeddedPkg/Include/Protocol/MmcHost.h | 4 | ||||
| -rw-r--r-- | EmbeddedPkg/Universal/MmcDxe/Mmc.c | 10 | ||||
| -rw-r--r-- | EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c index 365f78b306..ea477efcb2 100644 --- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c +++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c @@ -554,7 +554,7 @@ PL180MciDxeInitialize ( //Publish Component Name, BlockIO protocol interfaces
Status = gBS->InstallMultipleProtocolInterfaces (
&Handle,
- &gEfiMmcHostProtocolGuid, &gMciHost,
+ &gEmbeddedMmcHostProtocolGuid, &gMciHost,
NULL
);
ASSERT_EFI_ERROR (Status);
diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf index c70377bc7c..78e22f940a 100644 --- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf +++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf @@ -36,7 +36,7 @@ [Protocols]
gEfiCpuArchProtocolGuid
gEfiDevicePathProtocolGuid
- gEfiMmcHostProtocolGuid
+ gEmbeddedMmcHostProtocolGuid
[Pcd]
gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress
diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c index 68c523a99f..b95917bd7a 100644 --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c @@ -679,7 +679,7 @@ DwEmmcDxeInitialize ( //Publish Component Name, BlockIO protocol interfaces
Status = gBS->InstallMultipleProtocolInterfaces (
&Handle,
- &gEfiMmcHostProtocolGuid, &gMciHost,
+ &gEmbeddedMmcHostProtocolGuid, &gMciHost,
NULL
);
ASSERT_EFI_ERROR (Status);
diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf index 21c372c5b2..cf8e242213 100644 --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf @@ -37,7 +37,7 @@ [Protocols]
gEfiCpuArchProtocolGuid
gEfiDevicePathProtocolGuid
- gEfiMmcHostProtocolGuid
+ gEmbeddedMmcHostProtocolGuid
[Pcd]
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 69922802f4..7e0f692d6f 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -71,7 +71,7 @@ gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }}
gEmbeddedGpioProtocolGuid = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }}
gPeCoffLoaderProtocolGuid = { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }
- gEfiMmcHostProtocolGuid = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}
+ gEmbeddedMmcHostProtocolGuid = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}
gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}
gAndroidFastbootPlatformProtocolGuid = { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}
gUsbDeviceProtocolGuid = { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7, 0x0b, 0x44 }}
diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h index 9e07082680..4772528cf1 100644 --- a/EmbeddedPkg/Include/Protocol/MmcHost.h +++ b/EmbeddedPkg/Include/Protocol/MmcHost.h @@ -13,7 +13,7 @@ ///
/// Global ID for the MMC Host Protocol
///
-#define EFI_MMC_HOST_PROTOCOL_GUID \
+#define EMBEDDED_MMC_HOST_PROTOCOL_GUID \
{ 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B } }
#define MMC_RESPONSE_TYPE_R1 0
@@ -178,7 +178,7 @@ struct _EFI_MMC_HOST_PROTOCOL { #define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \
Host->IsMultiBlock != NULL)
-extern EFI_GUID gEfiMmcHostProtocolGuid;
+extern EFI_GUID gEmbeddedMmcHostProtocolGuid;
#endif
diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/MmcDxe/Mmc.c index c6170880de..d33f7f0a49 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c @@ -216,7 +216,7 @@ MmcDriverBindingSupported ( //
Status = gBS->OpenProtocol (
Controller,
- &gEfiMmcHostProtocolGuid,
+ &gEmbeddedMmcHostProtocolGuid,
(VOID **) &MmcHost,
This->DriverBindingHandle,
Controller,
@@ -234,7 +234,7 @@ MmcDriverBindingSupported ( //
gBS->CloseProtocol (
Controller,
- &gEfiMmcHostProtocolGuid,
+ &gEmbeddedMmcHostProtocolGuid,
This->DriverBindingHandle,
Controller
);
@@ -275,7 +275,7 @@ MmcDriverBindingStart ( //
Status = gBS->OpenProtocol (
Controller,
- &gEfiMmcHostProtocolGuid,
+ &gEmbeddedMmcHostProtocolGuid,
(VOID **) &MmcHost,
This->DriverBindingHandle,
Controller,
@@ -326,10 +326,10 @@ MmcDriverBindingStop ( MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink);
ASSERT(MmcHostInstance != NULL);
- // Close gEfiMmcHostProtocolGuid
+ // Close gEmbeddedMmcHostProtocolGuid
Status = gBS->CloseProtocol (
Controller,
- &gEfiMmcHostProtocolGuid,
+ &gEmbeddedMmcHostProtocolGuid,
This->DriverBindingHandle,
Controller
);
diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf index 67cdce6c5b..7a38bb4c72 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf +++ b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf @@ -38,7 +38,7 @@ gEfiDiskIoProtocolGuid
gEfiBlockIoProtocolGuid
gEfiDevicePathProtocolGuid
- gEfiMmcHostProtocolGuid
+ gEmbeddedMmcHostProtocolGuid
gEfiDriverDiagnostics2ProtocolGuid
[Depex]
|