tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ard Biesheuvel 2020-04-29 20:17:50 +02:00 committed by mergify[bot]
parent 13406bdeb5
commit 2a7a1223d0
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c
View File

@ -554,7 +554,7 @@ PL180MciDxeInitialize (
//Publish Component Name, BlockIO protocol interfaces //Publish Component Name, BlockIO protocol interfaces
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&Handle, &Handle,
&gEfiMmcHostProtocolGuid, &gMciHost, &gEmbeddedMmcHostProtocolGuid, &gMciHost,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);

2
ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
View File

@ -36,7 +36,7 @@
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid
gEfiMmcHostProtocolGuid gEmbeddedMmcHostProtocolGuid
[Pcd] [Pcd]
gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress

2
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
View File

@ -679,7 +679,7 @@ DwEmmcDxeInitialize (
//Publish Component Name, BlockIO protocol interfaces //Publish Component Name, BlockIO protocol interfaces
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&Handle, &Handle,
&gEfiMmcHostProtocolGuid, &gMciHost, &gEmbeddedMmcHostProtocolGuid, &gMciHost,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);

2
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
View File

@ -37,7 +37,7 @@
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid
gEfiMmcHostProtocolGuid gEmbeddedMmcHostProtocolGuid
[Pcd] [Pcd]
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress

2
EmbeddedPkg/EmbeddedPkg.dec
View File

@ -71,7 +71,7 @@
gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }} gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }}
gEmbeddedGpioProtocolGuid = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }} gEmbeddedGpioProtocolGuid = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }}
gPeCoffLoaderProtocolGuid = { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } } 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}} gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}
gAndroidFastbootPlatformProtocolGuid = { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}} gAndroidFastbootPlatformProtocolGuid = { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}
gUsbDeviceProtocolGuid = { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7, 0x0b, 0x44 }} gUsbDeviceProtocolGuid = { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7, 0x0b, 0x44 }}

4
EmbeddedPkg/Include/Protocol/MmcHost.h
View File

@ -13,7 +13,7 @@
/// ///
/// Global ID for the MMC Host Protocol /// 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 } } { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B } }
#define MMC_RESPONSE_TYPE_R1 0 #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 && \ #define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \
Host->IsMultiBlock != NULL) Host->IsMultiBlock != NULL)
extern EFI_GUID gEfiMmcHostProtocolGuid; extern EFI_GUID gEmbeddedMmcHostProtocolGuid;
#endif #endif

10
EmbeddedPkg/Universal/MmcDxe/Mmc.c
View File

@ -216,7 +216,7 @@ MmcDriverBindingSupported (
// //
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
Controller, Controller,
&gEfiMmcHostProtocolGuid, &gEmbeddedMmcHostProtocolGuid,
(VOID **) &MmcHost, (VOID **) &MmcHost,
This->DriverBindingHandle, This->DriverBindingHandle,
Controller, Controller,
@ -234,7 +234,7 @@ MmcDriverBindingSupported (
// //
gBS->CloseProtocol ( gBS->CloseProtocol (
Controller, Controller,
&gEfiMmcHostProtocolGuid, &gEmbeddedMmcHostProtocolGuid,
This->DriverBindingHandle, This->DriverBindingHandle,
Controller Controller
); );
@ -275,7 +275,7 @@ MmcDriverBindingStart (
// //
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
Controller, Controller,
&gEfiMmcHostProtocolGuid, &gEmbeddedMmcHostProtocolGuid,
(VOID **) &MmcHost, (VOID **) &MmcHost,
This->DriverBindingHandle, This->DriverBindingHandle,
Controller, Controller,
@ -326,10 +326,10 @@ MmcDriverBindingStop (
MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink); MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink);
ASSERT(MmcHostInstance != NULL); ASSERT(MmcHostInstance != NULL);
// Close gEfiMmcHostProtocolGuid // Close gEmbeddedMmcHostProtocolGuid
Status = gBS->CloseProtocol ( Status = gBS->CloseProtocol (
Controller, Controller,
&gEfiMmcHostProtocolGuid, &gEmbeddedMmcHostProtocolGuid,
This->DriverBindingHandle, This->DriverBindingHandle,
Controller Controller
); );

2
EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
View File

@ -38,7 +38,7 @@
gEfiDiskIoProtocolGuid gEfiDiskIoProtocolGuid
gEfiBlockIoProtocolGuid gEfiBlockIoProtocolGuid
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid
gEfiMmcHostProtocolGuid gEmbeddedMmcHostProtocolGuid
gEfiDriverDiagnostics2ProtocolGuid gEfiDriverDiagnostics2ProtocolGuid
[Depex] [Depex]