Fix “reconnect -r” ASSERT after VLAN configured.

[mirror_edk2.git] / Nt32Pkg / FvbServicesRuntimeDxe / FvbInfo.c

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
index b99790fc3bd2fe876f13006509a6803ff2960384..324374c44f4786a112106a7846c7023b05a15ed8 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -1,7 +1,7 @@
 /**@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
@@ -31,9 +31,7 @@ Abstract:
 #include <Guid/EventGroup.h>\r
 #include <Guid/FirmwareFileSystem2.h>\r
 #include <Guid/SystemNvDataGuid.h>\r
-#include <Protocol/FvbExtension.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r
-#include <Guid/AlternateFvBlock.h>\r
 #include <Protocol/DevicePath.h>\r
 //\r
 // The Library classes this module consumes\r
@@ -72,18 +70,20 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       EFI_FIRMWARE_FILE_SYSTEM2_GUID,\r
       FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),\r
       EFI_FVH_SIGNATURE,\r
-      EFI_FVB2_READ_ENABLED_CAP |\r
+      EFI_FVB2_MEMORY_MAPPED |  \r
+        EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
         EFI_FVB2_WRITE_ENABLED_CAP |\r
         EFI_FVB2_WRITE_STATUS |\r
-        EFI_FVB2_ERASE_POLARITY,\r
+        EFI_FVB2_ERASE_POLARITY |\r
+        EFI_FVB2_ALIGNMENT_16,\r
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
-      0,  // CheckSum\r
-      0,  // ExtHeaderOffset\r
+      0xE947,   // CheckSum\r
+      0,        // ExtHeaderOffset\r
       {\r
         0,\r
       },  // Reserved[1]\r
-      1,  // Revision\r
+      2,  // Revision\r
       {\r
         FixedPcdGet32 (PcdWinNtFlashFvRecoverySize)/FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
         FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
@@ -112,18 +112,20 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
       FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),\r
       EFI_FVH_SIGNATURE,\r
-      EFI_FVB2_READ_ENABLED_CAP |\r
+      EFI_FVB2_MEMORY_MAPPED |  \r
+        EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
         EFI_FVB2_WRITE_ENABLED_CAP |\r
         EFI_FVB2_WRITE_STATUS |\r
-        EFI_FVB2_ERASE_POLARITY,\r
+        EFI_FVB2_ERASE_POLARITY |\r
+        EFI_FVB2_ALIGNMENT_16,\r
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
-      0,  // CheckSum\r
-      0,  // ExtHeaderOffset\r
+      0xFBFF,  // CheckSum\r
+      0,       // ExtHeaderOffset\r
       {\r
         0,\r
       },  // Reserved[1]\r
-      1,  // Revision\r
+      2,  // Revision\r
       {\r
        (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
         FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r