On Mon, Jul 22, 2019 at 03:58:54PM -0700, Michael D Kinney wrote: > Update calls to S3BootScriptxxx() services to use type > S3_BOOT_SCRIPT_LIB_WIDTH instead of EFI_BOOT_SCRIPT_WIDTH. > Fixes XCODE5 build failures. > Reviewed-by: Gary Lin <g...@suse.com>
> Cc: Zailiang Sun <zailiang....@intel.com> > Cc: Yi Qian <yi.q...@intel.com> > Cc: Gary Lin <g...@suse.com> > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > --- > .../Library/EfiRegTableLib/EfiRegTableLib.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c > b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c > index d698f3ada9..8b16585337 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c > @@ -55,7 +55,7 @@ PciWrite ( > > if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) { > Status = S3BootScriptSavePciCfgWrite ( > - (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > + (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > (UINT64) Entry->PciAddress, > 1, > &Entry->Data > @@ -111,7 +111,7 @@ PciReadModifyWrite ( > > if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) { > Status = S3BootScriptSavePciCfgReadWrite ( > - (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > + (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > (UINT64) Entry->PciAddress, > &Entry->OrMask, > &Entry->AndMask > @@ -167,7 +167,7 @@ MemReadModifyWrite ( > > if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) { > Status = S3BootScriptSaveMemReadWrite ( > - (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > + (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)), > Entry->MemAddress, > &Entry->OrMask, > &Entry->AndMask > -- > 2.21.0.windows.1 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44229): https://edk2.groups.io/g/devel/message/44229 Mute This Topic: https://groups.io/mt/32564742/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-