MdeModulePkg/Core/Dxe: rebase to ARRAY_SIZE()

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVolBlock / FwVolBlock.h

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
index 0fa4c296bca6064698de84ede739f2d5ce128930..7ad4e35ecb346687fa90ea58186e12942f12edb0 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
@@ -2,8 +2,8 @@
   Firmware Volume Block protocol functions.\r
   Consumes FV hobs and creates appropriate block protocols.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2012, 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 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _FWVOL_BLOCK_H_\r
 \r
 \r
-#define FVB_DEVICE_SIGNATURE       EFI_SIGNATURE_32('_','F','V','B')\r
+#define FVB_DEVICE_SIGNATURE       SIGNATURE_32('_','F','V','B')\r
 \r
 \r
 typedef struct {\r
@@ -25,22 +25,29 @@ typedef struct {
   UINTN                       Length;\r
 } LBA_CACHE;\r
 \r
-\r
 typedef struct {\r
   MEMMAP_DEVICE_PATH          MemMapDevPath;\r
   EFI_DEVICE_PATH_PROTOCOL    EndDevPath;\r
-} FV_DEVICE_PATH;\r
+} FV_MEMMAP_DEVICE_PATH;\r
 \r
+//\r
+// UEFI Specification define FV device path format if FV provide name guid in extension header\r
+//\r
+typedef struct {\r
+  MEDIA_FW_VOL_DEVICE_PATH    FvDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndDevPath;\r
+} FV_PIWG_DEVICE_PATH;\r
 \r
 typedef struct {\r
   UINTN                                 Signature;\r
   EFI_HANDLE                            Handle;\r
-  FV_DEVICE_PATH                        DevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL              *DevicePath;\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    FwVolBlockInstance;\r
   UINTN                                 NumBlocks;\r
   LBA_CACHE                             *LbaCache;\r
   UINT32                                FvbAttributes;\r
   EFI_PHYSICAL_ADDRESS                  BaseAddress;\r
+  UINT32                                AuthenticationStatus;\r
 } EFI_FW_VOL_BLOCK_DEVICE;\r
 \r
 \r