From nobody Mon Feb 9 04:46:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44175+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44175+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563836349; cv=none; d=zoho.com; s=zohoarc; b=mJ4lJNFM4G+866HQHyG5Q2DKor4khQ6BDfRA1vW1RuCxDvQhhFF2fHRiW9KEYe1QCjOHmbtBxu9CIBzZcfc/UvrPsa4xDKgX4yCWVohyjudtgLpgzWgvlX1Mys/tR/rRBMscfgn/gqd/2jmfnKspUEwPPjab7bKhz+cF+Tqh1Jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563836349; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=vgyt+93OcWv34smo+CgQkoo6PGkTalxSj58TgWv46dY=; b=JuPwpjsCNxVZhKV7gw4ryU7HP121CQHdFwzO/oykqfQCmOy+sdXr6FJxudH1hcI++nKvn363nV5nBAkhoqsts8lRh8RE7k/m8uzYBUXbkuhMN0qjjaZHFDpkskbpacHDoZAzV0fi3/gpKslXJMzT0840JroZMYwn/1kncMok5Hs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44175+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1563836349587319.4667922974778; Mon, 22 Jul 2019 15:59:09 -0700 (PDT) Return-Path: X-Received: from mga07.intel.com (mga07.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 X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 15:59:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,296,1559545200"; d="scan'208";a="169386508" X-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-devel] [edk2-platforms Patch V3 10/12] Vlv2TbltDevicePkg: Fix XCODE5 build errors Date: Mon, 22 Jul 2019 15:58:57 -0700 Message-Id: <20190722225859.24724-11-michael.d.kinney@intel.com> In-Reply-To: <20190722225859.24724-1-michael.d.kinney@intel.com> References: <20190722225859.24724-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1563836349; bh=kO7kFxVma9KjNvS2C+DuqxDwhiDQ93BSauUGhLJMVYE=; h=Cc:Date:From:Reply-To:Subject:To; b=Zu8hIsTffeJNNDOP2WQVLWGG/AdmNZ/APAo5x4itDo+SyF48HcUEUXS8xii4BMjjKlh IKBbdR7WmgbXmyYbQ+WhNer+4IwROv8UL4JxFDE64wDUyYVC+/2RO1209unLT2dDFKRZG CoEioc/bJN3SXXCYjliS8ziRQq5PIfe6VM8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * Remove extra parenthesis in if statements * Remove local variable structure initialization that adds use of memcpy() on XCODE X64 builds. Move per-initialize structure to a module global. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney --- .../Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 12 ++++++++++-- .../Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c | 2 +- .../Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c | 2 +- .../VlvPlatformInitDxe/IgdOpRegion.c | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 479ffa61a0..3e0b978120 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -63,6 +63,15 @@ SYSTEM_CONFIGURATION mSystemConfig; UINT8 mSmbusRsvdAddresses[] =3D PLATFORM_SMBUS_RSVD_ADDRESSES; UINT8 mNumberSmbusAddress =3D sizeof( mSmbusRsvdAddresses ) / sizeof( mSmb= usRsvdAddresses[0] ); =20 +EFI_ACPI_OSFR_OCUR_OBJECT mOcurObjectTemplate =3D { + {0xB46F133D, 0x235F, 0x4634, 0x9F, 0x03, 0xB1, 0xC0, 0x1C, 0x54, 0x78, 0= x5B}, + 0, + 0, + 0, + 0, + 0 +}; + /** Locate the first instance of a protocol. If the protocol requested is an FV protocol, then it will return the first FV that contains the ACPI tab= le @@ -203,7 +212,6 @@ PlatformUpdateTables ( EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *Facp; EFI_ACPI_OSFR_TABLE *OsfrTable; EFI_ACPI_OSFR_OCUR_OBJECT *pOcurObject; - EFI_ACPI_OSFR_OCUR_OBJECT OcurObject = =3D {{0xB46F133D, 0x235F, 0x4634, 0x9F, 0x03, 0xB1, 0xC0, 0x1C, 0x54, 0x78,= 0x5B}, 0, 0, 0, 0, 0}; CHAR16 *OcurMfgStri= ngBuffer =3D NULL; CHAR16 *OcurModelSt= ringBuffer =3D NULL; UINT8 *OcurRefData= BlockBuffer =3D NULL; @@ -554,7 +562,7 @@ PlatformUpdateTables ( (UINT32) (sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + sizeof = (UINT32)); pOcurObject =3D (EFI_ACPI_OSFR_OCUR_OBJECT *)((UINTN) OsfrTable = + sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + \ sizeof (UINT32)); - CopyMem (pOcurObject, &OcurObject, sizeof (EFI_ACPI_OSFR_OCUR_OB= JECT)); + CopyMem (pOcurObject, &mOcurObjectTemplate, sizeof (EFI_ACPI_OSF= R_OCUR_OBJECT)); pOcurObject->ManufacturerNameStringOffset =3D (UINT32)((UINTN) p= OcurObject - (UINTN) OsfrTable + \ sizeof (EFI_ACPI_OSFR_OCUR_OBJECT)); pOcurObject->ModelNameStringOffset =3D (UINT32)((UINTN) pOcurObj= ect - (UINTN) OsfrTable + \ diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c b/P= latform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c index b1c01afc16..69ced08a58 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c @@ -250,7 +250,7 @@ GetPciRom ( // // Do not run RAID or AHCI Option ROM if IDE // - if ( (DeviceClass =3D=3D ((PCI_CLASS_MASS_STORAGE << 8 ) | PCI_CLASS_M= ASS_STORAGE_IDE)) ) { + if (DeviceClass =3D=3D ((PCI_CLASS_MASS_STORAGE << 8 ) | PCI_CLASS_MAS= S_STORAGE_IDE)) { return EFI_NOT_FOUND; } =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c= b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c index 71d6cb7c15..0b5d7f76a1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c @@ -514,7 +514,7 @@ IchRcrbInit ( // // Initial RCBA according to the PeiRCBA table // - if ((BootMode =3D=3D BOOT_ON_S3_RESUME)) { + if (BootMode =3D=3D BOOT_ON_S3_RESUME) { // // We are resuming from S3 // Enable HPET if enabled in Setup diff --git a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegio= n.c b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c index dad27f130d..fcd9e566ae 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c @@ -573,7 +573,7 @@ GetVBiosVbtCallback ( return EFI_SUCCESS; } } - if ((VBiosPtr =3D=3D NULL) ) { + if (VBiosPtr =3D=3D NULL) { // // Intel video BIOS not found. // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44175): https://edk2.groups.io/g/devel/message/44175 Mute This Topic: https://groups.io/mt/32564743/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-