Browse Source

Vlv2TbltDevicePkg: Fix XCODE5 build errors

* 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 <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
Tested-by: Gary Lin <glin@suse.com>
Michael D Kinney 4 years ago
parent
commit
dbc210212e

+ 10 - 2
Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c

@@ -63,6 +63,15 @@ SYSTEM_CONFIGURATION      mSystemConfig;
 UINT8 mSmbusRsvdAddresses[] = PLATFORM_SMBUS_RSVD_ADDRESSES;
 UINT8 mSmbusRsvdAddresses[] = PLATFORM_SMBUS_RSVD_ADDRESSES;
 UINT8 mNumberSmbusAddress = sizeof( mSmbusRsvdAddresses ) / sizeof( mSmbusRsvdAddresses[0] );
 UINT8 mNumberSmbusAddress = sizeof( mSmbusRsvdAddresses ) / sizeof( mSmbusRsvdAddresses[0] );
 
 
+EFI_ACPI_OSFR_OCUR_OBJECT  mOcurObjectTemplate = {
+  {0xB46F133D, 0x235F, 0x4634, 0x9F, 0x03, 0xB1, 0xC0, 0x1C, 0x54, 0x78, 0x5B},
+  0,
+  0,
+  0,
+  0,
+  0
+};
+
 /**
 /**
   Locate the first instance of a protocol.  If the protocol requested is an
   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 table
   FV protocol, then it will return the first FV that contains the ACPI table
@@ -203,7 +212,6 @@ PlatformUpdateTables (
   EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE                   *Facp;
   EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE                   *Facp;
   EFI_ACPI_OSFR_TABLE                                         *OsfrTable;
   EFI_ACPI_OSFR_TABLE                                         *OsfrTable;
   EFI_ACPI_OSFR_OCUR_OBJECT                                   *pOcurObject;
   EFI_ACPI_OSFR_OCUR_OBJECT                                   *pOcurObject;
-  EFI_ACPI_OSFR_OCUR_OBJECT                                   OcurObject = {{0xB46F133D, 0x235F, 0x4634, 0x9F, 0x03, 0xB1, 0xC0, 0x1C, 0x54, 0x78, 0x5B}, 0, 0, 0, 0, 0};
   CHAR16                                                      *OcurMfgStringBuffer = NULL;
   CHAR16                                                      *OcurMfgStringBuffer = NULL;
   CHAR16                                                      *OcurModelStringBuffer = NULL;
   CHAR16                                                      *OcurModelStringBuffer = NULL;
   UINT8                                                       *OcurRefDataBlockBuffer = NULL;
   UINT8                                                       *OcurRefDataBlockBuffer = NULL;
@@ -554,7 +562,7 @@ PlatformUpdateTables (
             (UINT32) (sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + sizeof (UINT32));
             (UINT32) (sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + sizeof (UINT32));
           pOcurObject = (EFI_ACPI_OSFR_OCUR_OBJECT *)((UINTN) OsfrTable + sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + \
           pOcurObject = (EFI_ACPI_OSFR_OCUR_OBJECT *)((UINTN) OsfrTable + sizeof (EFI_ACPI_OSFR_TABLE_FIXED_PORTION) + \
             sizeof (UINT32));
             sizeof (UINT32));
-          CopyMem (pOcurObject, &OcurObject, sizeof (EFI_ACPI_OSFR_OCUR_OBJECT));
+          CopyMem (pOcurObject, &mOcurObjectTemplate, sizeof (EFI_ACPI_OSFR_OCUR_OBJECT));
           pOcurObject->ManufacturerNameStringOffset = (UINT32)((UINTN) pOcurObject - (UINTN) OsfrTable + \
           pOcurObject->ManufacturerNameStringOffset = (UINT32)((UINTN) pOcurObject - (UINTN) OsfrTable + \
             sizeof (EFI_ACPI_OSFR_OCUR_OBJECT));
             sizeof (EFI_ACPI_OSFR_OCUR_OBJECT));
           pOcurObject->ModelNameStringOffset = (UINT32)((UINTN) pOcurObject - (UINTN) OsfrTable + \
           pOcurObject->ModelNameStringOffset = (UINT32)((UINTN) pOcurObject - (UINTN) OsfrTable + \

+ 1 - 1
Platform/Intel/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c

@@ -250,7 +250,7 @@ GetPciRom (
     //
     //
     // Do not run RAID or AHCI Option ROM if IDE
     // Do not run RAID or AHCI Option ROM if IDE
     //
     //
-    if ( (DeviceClass == ((PCI_CLASS_MASS_STORAGE << 8 ) | PCI_CLASS_MASS_STORAGE_IDE)) ) {
+    if (DeviceClass == ((PCI_CLASS_MASS_STORAGE << 8 ) | PCI_CLASS_MASS_STORAGE_IDE)) {
       return EFI_NOT_FOUND;
       return EFI_NOT_FOUND;
     }
     }
 
 

+ 1 - 1
Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c

@@ -514,7 +514,7 @@ IchRcrbInit (
   //
   //
   // Initial RCBA according to the PeiRCBA table
   // Initial RCBA according to the PeiRCBA table
   //
   //
-  if ((BootMode == BOOT_ON_S3_RESUME)) {
+  if (BootMode == BOOT_ON_S3_RESUME) {
     //
     //
     // We are resuming from S3
     // We are resuming from S3
     // Enable HPET if enabled in Setup
     // Enable HPET if enabled in Setup

+ 1 - 1
Platform/Intel/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c

@@ -573,7 +573,7 @@ GetVBiosVbtCallback (
         return EFI_SUCCESS;
         return EFI_SUCCESS;
       }
       }
     }
     }
-    if ((VBiosPtr == NULL) ) {
+    if (VBiosPtr == NULL) {
       //
       //
       // Intel video BIOS not found.
       // Intel video BIOS not found.
       //
       //