Add UINT16/32/64 array and DSC include support.

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

diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
index 643b92c44647b6add3df24bd2ca6c2d0d874985e..20774ee18e92e62f53f86fde82617fe4a3ac8cf4 100644 (file)
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
@@ -1,7 +1,7 @@
-/*++\r
+/**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -17,7 +17,7 @@ Abstract:
 \r
 Revision History\r
 \r
---*/\r
+**/\r
 \r
 //\r
 // The package level header files this module uses\r
@@ -66,16 +66,15 @@ Returns:
 \r
   DEBUG ((EFI_D_ERROR, "NT 32 Firmware Volume PEIM Loaded\n"));\r
 \r
-  __asm int 3;\r
   //\r
   // 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
@@ -118,14 +117,13 @@ Returns:
         // 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 + PcdGet32 (PcdWinNtFlashNvStorageVariableBase);\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