FatPkg: Add RecoveryBlockIo2Ppi support

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

(based on FatPkg commit add52adf722d2b0f1db4c8780a30289dacd59e02)

[jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/FatPkg/FatPei/FatLitePeim.h b/FatPkg/FatPei/FatLitePeim.h
index 69429fe03a..e838390de4 100644
--- a/FatPkg/FatPei/FatLitePeim.h
+++ b/FatPkg/FatPei/FatLitePeim.h
@@ -1,7 +1,7 @@
 /** @file

   Data structures for FAT recovery PEIM

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials are licensed and made available

 under the terms and conditions of the BSD License which accompanies this

@@ -20,6 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include <Guid/RecoveryDevice.h>

 #include <Ppi/BlockIo.h>

+#include <Ppi/BlockIo2.h>

 #include <Ppi/DeviceRecoveryModule.h>

 

 #include <Library/DebugLib.h>

@@ -73,11 +74,13 @@ typedef struct {
   // Following fields only valid for physical device

   //

   EFI_PEI_BLOCK_DEVICE_TYPE     DevType;

+  UINT8                         InterfaceType;

   //

   // EFI_PEI_READ_BLOCKS         ReadFunc;

   //

-  EFI_PEI_RECOVERY_BLOCK_IO_PPI *BlockIo;

-  UINT8                         PhysicalDevNo;

+  EFI_PEI_RECOVERY_BLOCK_IO_PPI  *BlockIo;

+  EFI_PEI_RECOVERY_BLOCK_IO2_PPI *BlockIo2;

+  UINT8                          PhysicalDevNo;

 } PEI_FAT_BLOCK_DEVICE;

 

 //

@@ -150,7 +153,7 @@ typedef struct {
   UINTN                               Signature;

   EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  DeviceRecoveryPpi;

   EFI_PEI_PPI_DESCRIPTOR              PpiDescriptor;

-  EFI_PEI_NOTIFY_DESCRIPTOR           NotifyDescriptor;

+  EFI_PEI_NOTIFY_DESCRIPTOR           NotifyDescriptor[2];

 

   UINT8                               UnicodeCaseMap[0x300];

   CHAR8                               *EngUpperMap;