Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdePkg: Fix guid conflict. 

Update Image Decoder Protocol GUID value to fix GUID
conflict with EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Dong, Eric 2016-08-12 10:09:48 +08:00 committed by Liming Gao
parent de74668f5e
commit d35ec1e050
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdePkg/Include/Protocol/ImageDecoder.h
View File

@ -18,8 +18,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/HiiImage.h> #include <Protocol/HiiImage.h>
//
// In UEFI 2.6 spec,this guid value is duplicate with
// EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID. Now update this guid value to
// avoid the duplicate guid issue. So its value is not consistent with
// UEFI spec definition now. We have proposed to update UEFI spec to
// use this new guid. After new spec released, we will remove this
// comments.
//
#define EFI_HII_IMAGE_DECODER_PROTOCOL_GUID \ #define EFI_HII_IMAGE_DECODER_PROTOCOL_GUID \
{ 0x2f707ebb, 0x4a1a, 0x11d4, {0x9a,0x38,0x00,0x90,0x27,0x3f,0xc1,0x4d}} {0x9e66f251, 0x727c, 0x418c, { 0xbf, 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x18, 0xea }}
#define EFI_HII_IMAGE_DECODER_NAME_JPEG_GUID \ #define EFI_HII_IMAGE_DECODER_NAME_JPEG_GUID \

10
MdePkg/MdePkg.dec
View File

@ -1620,7 +1620,15 @@
gEfiRamDiskProtocolGuid = { 0xab38a0df, 0x6873, 0x44a9, { 0x87, 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }} gEfiRamDiskProtocolGuid = { 0xab38a0df, 0x6873, 0x44a9, { 0x87, 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }}
## Include/Protocol/ImageDecoder.h ## Include/Protocol/ImageDecoder.h
gEfiHiiImageDecoderProtocolGuid = { 0x2f707ebb, 0x4a1a, 0x11d4, { 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} ##
## In UEFI 2.6 spec,this guid value is duplicate with
## EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID. Now update this guid value to
## avoid the duplicate guid issue. So its value is not consistent with
## UEFI spec definition now. We have proposed to update UEFI spec to
## use this new guid. After new spec released, we will remove this
## comments.
##
gEfiHiiImageDecoderProtocolGuid = { 0x9e66f251, 0x727c, 0x418c, { 0xbf, 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x18, 0xea }}
## Include/Protocol/HiiImageEx.h ## Include/Protocol/HiiImageEx.h
gEfiHiiImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef, 0x39, 0xe0, 0x65, 0x46 }} gEfiHiiImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe, 0xe8, 0xef, 0x39, 0xe0, 0x65, 0x46 }}