Vlv2TbltDevicePkg: Fix VS2015 build breaks

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformSetupDxe / SetupInfoRecords.c

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
index 99684e72d7c372dc6e876ebebfda3f9363bf85fa..f608651cd4edfaaa26f354ecf51502db7ada224c 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
@@ -520,7 +520,6 @@ PrepareSetupInformation (
   EFI_DATA_HUB_PROTOCOL       *DataHub;\r
   EFI_DATA_RECORD_HEADER      *Record;\r
   UINT8                       *SrcData;\r
-  UINT32                      SrcDataSize;\r
   EFI_SUBCLASS_TYPE1_HEADER   *DataHeader;\r
   CHAR16                      *NewString;\r
   CHAR16                      *NewString2;\r
@@ -528,7 +527,6 @@ PrepareSetupInformation (
   STRING_REF                  TokenToUpdate;\r
   EFI_PROCESSOR_VERSION_DATA  *ProcessorVersion;\r
   UINTN                       Index;\r
-  UINT16                      EeState;\r
   UINTN                       DataOutput;\r
 \r
   EFI_PROCESSOR_MICROCODE_REVISION_DATA   *CpuUcodeRevisionData;\r
@@ -546,11 +544,6 @@ PrepareSetupInformation (
   SetMem(ReleaseDate, sizeof(ReleaseDate), 0);\r
   SetMem(ReleaseTime, sizeof(ReleaseTime), 0);\r
 \r
-  //\r
-  // Initialize EE state for not to show EE related setup options\r
-  //\r
-  EeState = 0;\r
-\r
   //\r
   // Get the Data Hub Protocol. Assume only one instance\r
   //\r
@@ -569,7 +562,6 @@ PrepareSetupInformation (
       if (Record->DataRecordClass == EFI_DATA_RECORD_CLASS_DATA) {\r
         DataHeader  = (EFI_SUBCLASS_TYPE1_HEADER *)(Record + 1);\r
         SrcData     = (UINT8  *)(DataHeader + 1);\r
-        SrcDataSize = Record->RecordSize - Record->HeaderSize - sizeof (EFI_SUBCLASS_TYPE1_HEADER);\r
 \r
         //\r
         // Processor\r
@@ -805,8 +797,6 @@ UpdateAdditionalInformation (
   EFI_DATA_HUB_PROTOCOL           *DataHub;\r
   EFI_DATA_RECORD_HEADER          *Record;\r
   EFI_SUBCLASS_TYPE1_HEADER       *DataHeader;\r
-  EFI_MISC_SYSTEM_MANUFACTURER    *SystemManufacturer;\r
-  UINTN                           Size;\r
   EFI_SMBIOS_PROTOCOL             *Smbios;\r
   EFI_SMBIOS_HANDLE               SmbiosHandle;\r
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
@@ -816,6 +806,9 @@ UpdateAdditionalInformation (
   CHAR16                          *IfwiVersion = NULL;\r
   UINT16                          SearchIndex;\r
   EFI_STRING_ID                   TokenToUpdate;\r
+#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
+  EFI_MISC_SYSTEM_MANUFACTURER    *SystemManufacturer;\r
+#endif\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
@@ -825,8 +818,6 @@ UpdateAdditionalInformation (
 \r
   ASSERT_EFI_ERROR(Status);\r
 \r
-  Size = 3;\r
-\r
   MonotonicCount  = 0;\r
   Record = NULL;\r
   do {\r
@@ -841,12 +832,12 @@ UpdateAdditionalInformation (
 \r
       if (CompareGuid(&Record->DataRecordGuid, &gEfiMiscSubClassGuid) &&\r
           (DataHeader->RecordType == EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER)) {\r
+#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
         //\r
         // System Information\r
         //\r
         SystemManufacturer = (EFI_MISC_SYSTEM_MANUFACTURER *)(DataHeader + 1);\r
 \r
-#if defined( RVP_SUPPORT ) && RVP_SUPPORT\r
         //\r
         // UUID  (System Information)\r
         //\r
@@ -1082,7 +1073,6 @@ JudgeHandleIsPCIDevice(
 {\r
   EFI_STATUS  Status;\r
   EFI_DEVICE_PATH   *DPath;\r
-  EFI_DEVICE_PATH   *DevicePath;\r
 \r
   Status = gBS->HandleProtocol (\r
                   Handle,\r
@@ -1091,7 +1081,6 @@ JudgeHandleIsPCIDevice(
                   );\r
   if(!EFI_ERROR(Status))\r
   {\r
-    DevicePath = DPath;\r
     while(!IsDevicePathEnd(DPath))\r
     {\r
       if((DPath->Type == HARDWARE_DEVICE_PATH) && (DPath->SubType == HW_PCI_DP))\r
@@ -1196,7 +1185,6 @@ UpdatePlatformInformation (
   EFI_STATUS               Status;\r
   UINT8                    CpuFlavor=0;\r
   EFI_PEI_HOB_POINTERS     GuidHob;\r
-  EFI_PLATFORM_INFO_HOB    *mPlatformInfo=NULL;\r
   UINTN                    NumHandles;\r
   EFI_HANDLE                        *HandleBuffer;\r
   UINTN                             Index;\r
@@ -1382,7 +1370,7 @@ UpdatePlatformInformation (
                             );\r
 \r
          Data8 = MmioRead8 (PciD31F0RegBase + R_PCH_LPC_RID_CC);\r
-         count = sizeof (SBRevisionTable) / sizeof (SBRevisionTable[0]);\r
+         count = ARRAY_SIZE (SBRevisionTable);\r
          for (Index = 0; Index < count; Index++) {\r
            if(Data8 == SBRevisionTable[Index].RevId) {\r
               UnicodeSPrint (Buffer, sizeof (Buffer), L"%02x %a", Data8, SBRevisionTable[Index].String);\r
@@ -1457,9 +1445,6 @@ GetChipsetSataPortSpeed (
   UINT32                      IdeAhciBar;\r
   EFI_PHYSICAL_ADDRESS        MemBaseAddress = 0;\r
   UINT8                       FunNum;\r
-  EFI_STATUS                  Status;\r
-  UINT32                      DwordReg;\r
-\r
 \r
   DeviceSpeed = 0x01; // generation 1\r
 \r
@@ -1469,15 +1454,15 @@ GetChipsetSataPortSpeed (
   //\r
     FunNum = PCI_FUNCTION_NUMBER_PCH_SATA;\r
     MemBaseAddress = 0x0ffffffff;\r
-    Status = gDS->AllocateMemorySpace (\r
-                    EfiGcdAllocateMaxAddressSearchBottomUp,\r
-                    EfiGcdMemoryTypeMemoryMappedIo,\r
-                    N_PCH_SATA_ABAR_ALIGNMENT,  // 2^11: 2K Alignment\r
-                    V_PCH_SATA_ABAR_LENGTH,     // 2K Length\r
-                    &MemBaseAddress,\r
-                    mImageHandle,\r
-                    NULL\r
-                    );\r
+    gDS->AllocateMemorySpace (\r
+           EfiGcdAllocateMaxAddressSearchBottomUp,\r
+           EfiGcdMemoryTypeMemoryMappedIo,\r
+           N_PCH_SATA_ABAR_ALIGNMENT,  // 2^11: 2K Alignment\r
+           V_PCH_SATA_ABAR_LENGTH,     // 2K Length\r
+           &MemBaseAddress,\r
+           mImageHandle,\r
+           NULL\r
+           );\r
     IdeAhciBar = MmioRead32 (\r
                    MmPciAddress (\r
                                     0,\r
@@ -1507,7 +1492,6 @@ GetChipsetSataPortSpeed (
       // Program the "Ports Implemented Register"\r
       //\r
       MmioAndThenOr32 (IdeAhciBar + R_PCH_SATA_AHCI_PI, (UINT32)~(B_PCH_SATA_PORT0_IMPLEMENTED + B_PCH_SATA_PORT1_IMPLEMENTED), (UINT32)(B_PCH_SATA_PORT0_IMPLEMENTED + B_PCH_SATA_PORT1_IMPLEMENTED));\r
-      DwordReg = MmioRead32 (IdeAhciBar + R_PCH_SATA_AHCI_PI);\r
     }\r
 \r
     switch (PortNum)\r
@@ -1750,7 +1734,18 @@ SetupInfo (void)
                   &mSystemConfiguration\r
                                  );\r
 \r
-  ASSERT_EFI_ERROR (Status);\r
+  if (EFI_ERROR (Status) || VarSize != sizeof(SYSTEM_CONFIGURATION)) {\r
+    //The setup variable is corrupted\r
+    VarSize = sizeof(SYSTEM_CONFIGURATION);\r
+    Status = gRT->GetVariable(\r
+              L"SetupRecovery",\r
+              &gEfiNormalSetupGuid,\r
+              NULL,\r
+              &VarSize,\r
+              &mSystemConfiguration\r
+              );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }  \r
 \r
   //\r
   // Update HOB variable for PCI resource information\r