Nt32Pkg: Replace BSD License with BSD+Patent License

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

diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
index b5afe106ee7d33482b34f1492159d574cfb5a2c7..f489bb7194229167b19aecbe3ecf510727a4d7dd 100644 (file)
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c
@@ -1,13 +1,7 @@
-/*++\r
+/**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 Module Name:\r
   WinNtFwh.c\r
@@ -17,7 +11,7 @@ Abstract:
 \r
 Revision History\r
 \r
---*/\r
+**/\r
 \r
 //\r
 // The package level header files this module uses\r
@@ -48,7 +42,7 @@ Routine Description:
   Perform a call-back into the SEC simulator to get address of the Firmware Hub\r
 \r
 Arguments:\r
-  FfsHeader   - Ffs Header availible to every PEIM\r
+  FfsHeader   - Ffs Header available to every PEIM\r
   PeiServices - General purpose services available to every PEIM.\r
     \r
 Returns:\r
@@ -70,11 +64,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
@@ -117,14 +111,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