Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Framework / Protocol / FirmwareVolumeBlock / FirmwareVolumeBlock.h

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
index 8502810e1bbe0338896322f5453c5811ff471c36..a2fd4e9d7a0b7644308e391c9861c03128b5d11d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2004, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004 - 2010, 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
@@ -28,13 +28,20 @@ Abstract:
 \r
 #include "EfiFirmwareVolumeHeader.h"\r
 \r
+//\r
+// The following GUID value has been changed to EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL_GUID in\r
+// PI 1.2 spec on purpose. This will force all platforms built with EdkCompatibilityPkg\r
+// produce FVB 2 protocol.\r
+//\r
 #define EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID \\r
   { \\r
-    0xDE28BC59, 0x6228, 0x41BD, 0xBD, 0xF6, 0xA3, 0xB9, 0xAD, 0xB5, 0x8D, 0xA1 \\r
+    0x8f644fa9, 0xe850, 0x4db1, {0x9c, 0xe2, 0xb, 0x44, 0x69, 0x8e, 0x8d, 0xa4 } \\r
   }\r
 \r
 EFI_FORWARD_DECLARATION (EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL);\r
 \r
+typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL;\r
+\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FVB_GET_ATTRIBUTES) (\r
@@ -235,7 +242,7 @@ Returns:
 --*/\r
 ;\r
 \r
-typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {\r
+struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {\r
   EFI_FVB_GET_ATTRIBUTES        GetVolumeAttributes;\r
   EFI_FVB_SET_ATTRIBUTES        SetVolumeAttributes;\r
   EFI_FVB_GET_PHYSICAL_ADDRESS  GetPhysicalAddress;\r
@@ -244,7 +251,7 @@ typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {
   EFI_FVB_WRITE                 Write;\r
   EFI_FVB_ERASE_BLOCKS          EraseBlocks;\r
   EFI_HANDLE                    ParentHandle;\r
-} EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
+};\r
 \r
 extern EFI_GUID gEfiFirmwareVolumeBlockProtocolGuid;\r
 \r