Update DSC&FDF files according to update of status code PEIM.

[mirror_edk2.git] / Nt32Pkg / WinNtFirmwareVolumePei / WinntFwh.c

diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
index 2431133136dd28a1623399fb16ea375f51ea38b1..fe7b23dd28a7ef27cf340c1dbc9e49856e730964 100644 (file)
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
@@ -1,4 +1,4 @@
-/*++\r
+/**@file\r
 \r
 Copyright (c) 2006, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
@@ -17,7 +17,7 @@ Abstract:
 \r
 Revision History\r
 \r
---*/\r
+**/\r
 \r
 //\r
 // The package level header files this module uses\r
@@ -34,9 +34,7 @@ Revision History
 #include <Library/DebugLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/HobLib.h>\r
-\r
-#include <FlashLayout.h>\r
-\r
+#include <Library/PcdLib.h>\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -72,11 +70,11 @@ Returns:
   // Get the Fwh Information PPI\r
   //\r
   Status = (**PeiServices).LocatePpi (\r
-                            PeiServices,\r
+                            (const EFI_PEI_SERVICES **)PeiServices,\r
                             &gNtFwhPpiGuid, // GUID\r
                             0,              // INSTANCE\r
                             &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR\r
-                            &FwhPpi         // PPI\r
+                            (VOID**)&FwhPpi         // PPI\r
                             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -107,17 +105,25 @@ Returns:
           EFI_RESOURCE_FIRMWARE_DEVICE,\r
           (EFI_RESOURCE_ATTRIBUTE_PRESENT | EFI_RESOURCE_ATTRIBUTE_INITIALIZED | EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE),\r
           FdBase,\r
-          (FvHeader->FvLength + EFI_WINNT_RUNTIME_UPDATABLE_LENGTH + EFI_WINNT_FTW_SPARE_BLOCK_LENGTH)\r
+          ( \r
+            FvHeader->FvLength + \r
+            PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+            PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+            PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+            PcdGet32 (PcdWinNtFlashNvStorageEventLogSize)\r
+          )\r
           );\r
-\r
         //\r
         // Hard code the address of the spare block and variable services.\r
         //  Assume it's a hard coded offset from FV0 in FD0.\r
         //\r
-        FdBase  = FdBase + EFI_WINNT_RUNTIME_UPDATABLE_OFFSET;\r
-        FdSize  = EFI_WINNT_RUNTIME_UPDATABLE_LENGTH + EFI_WINNT_FTW_SPARE_BLOCK_LENGTH;\r
+        FdSize  = \r
+          PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+          PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+          PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+          PcdGet32 (PcdWinNtFlashNvStorageEventLogSize);\r
 \r
-        BuildFvHob (FdBase, FdSize);\r
+        BuildFvHob (FdBase + PcdGet32 (PcdWinNtFlashNvStorageVariableBase), FdSize);\r
       } else {\r
         //\r
         // For other FD's just map them in.\r