X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FBus%2FSd%2FEmmcDxe%2FComponentName.c;h=b66bbff824ba23d47edaff3e1bb428d3e211d714;hb=1436aea4d5707e672672a11bda72be2c63c936c3;hp=6a4d18d4d66893d4dd3f0088d47e63bbc2c74257;hpb=7c7184e201a90a1d2376e615e55e3f4074731468;p=mirror_edk2.git diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c b/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c index 6a4d18d4d6..b66bbff824 100644 --- a/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c +++ b/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c @@ -11,17 +11,17 @@ // // Driver name table // -GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmmcDxeDriverNameTable[] = { +GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmmcDxeDriverNameTable[] = { { "eng;en", L"Edkii Emmc Device Driver" }, - { NULL , NULL } + { NULL, NULL } }; // // Controller name table // -GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmmcDxeControllerNameTable[] = { +GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mEmmcDxeControllerNameTable[] = { { "eng;en", L"Edkii Emmc Host Controller" }, - { NULL , NULL } + { NULL, NULL } }; // @@ -36,9 +36,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gEmmcDxeComponentName // // EFI Component Name 2 Protocol // -GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmmcDxeComponentName2 = { - (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmmcDxeComponentNameGetDriverName, - (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmmcDxeComponentNameGetControllerName, +GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmmcDxeComponentName2 = { + (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmmcDxeComponentNameGetDriverName, + (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmmcDxeComponentNameGetControllerName, "en" }; @@ -96,7 +96,6 @@ EmmcDxeComponentNameGetDriverName ( DriverName, (BOOLEAN)(This == &gEmmcDxeComponentName) ); - } /** @@ -170,11 +169,11 @@ EmmcDxeComponentNameGetDriverName ( EFI_STATUS EFIAPI EmmcDxeComponentNameGetControllerName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE ChildHandle OPTIONAL, - IN CHAR8 *Language, - OUT CHAR16 **ControllerName + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE ChildHandle OPTIONAL, + IN CHAR8 *Language, + OUT CHAR16 **ControllerName ) { EFI_STATUS Status; @@ -205,13 +204,14 @@ EmmcDxeComponentNameGetControllerName ( if (EFI_ERROR (Status)) { return Status; } + // // Get the child context // Status = gBS->OpenProtocol ( ChildHandle, &gEfiBlockIoProtocolGuid, - (VOID **) &BlockIo, + (VOID **)&BlockIo, gEmmcDxeDriverBinding.DriverBindingHandle, ChildHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL @@ -220,8 +220,8 @@ EmmcDxeComponentNameGetControllerName ( return EFI_UNSUPPORTED; } - Partition = EMMC_PARTITION_DATA_FROM_BLKIO (BlockIo); - Device = Partition->Device; + Partition = EMMC_PARTITION_DATA_FROM_BLKIO (BlockIo); + Device = Partition->Device; ControllerNameTable = Device->ControllerNameTable; } @@ -233,4 +233,3 @@ EmmcDxeComponentNameGetControllerName ( (BOOLEAN)(This == &gEmmcDxeComponentName) ); } -