From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Mon, 22 Jul 2019 15:59:08 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 15:59:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,296,1559545200"; d="scan'208";a="169386496" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.254.83.213]) by fmsmga008.fm.intel.com with ESMTP; 22 Jul 2019 15:59:06 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH Date: Mon, 22 Jul 2019 15:58:54 -0700 Message-Id: <20190722225859.24724-8-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190722225859.24724-1-michael.d.kinney@intel.com> References: <20190722225859.24724-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update calls to S3BootScriptxxx() services to use type S3_BOOT_SCRIPT_LIB_WIDTH instead of EFI_BOOT_SCRIPT_WIDTH. Fixes XCODE5 build failures. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney --- .../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