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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 9 insertions, 2 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
index ac914f7508..0767b8a4a1 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
@@ -1,6 +1,6 @@
 /*++

 

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

+Copyright (c) 2004 - 2010, 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 distribution.  The full text of the license may be found at        

@@ -185,9 +185,16 @@ typedef struct {
   UINT32  IoAlign;

 

   EFI_LBA LastBlock;

+

+  EFI_LBA LowestAlignedLba;

+  UINT32  LogicalBlocksPerPhysicalBlock;

 } EFI_BLOCK_IO_MEDIA;

 

-#define EFI_BLOCK_IO_PROTOCOL_REVISION  0x00010000

+#define EFI_BLOCK_IO_PROTOCOL_REVISION     0x00010000

+#define EFI_BLOCK_IO_PROTOCOL_REVISION2    0x00020001

+

+#define SIZE_OF_EFI_BLOCK_IO_MEDIA_REV1  ((UINTN)&((EFI_BLOCK_IO_MEDIA *)0)->LastBlock + sizeof(EFI_LBA))

+#define SIZE_OF_EFI_BLOCK_IO_MEDIA_REV2  sizeof(EFI_BLOCK_IO_MEDIA)

 

 struct _EFI_BLOCK_IO_PROTOCOL {

   UINT64              Revision;