Rollback the change of EFI_FVB_ATTRIBUTE, because not clearly about how to change...

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

diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 8406f4abde5bb6f623dbb922d6b7b104991566d8..7675df016c3052d58eee58446f367ef0cbff03bb 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -30,7 +30,7 @@ typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
 #define EFI_FV_FILE_ATTRIB_FIXED          0x00000100\r
 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200\r
 \r
 #define EFI_FV_FILE_ATTRIB_FIXED          0x00000100\r
 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200\r
 \r

-typedef UINT32  EFI_FVB2_ATTRIBUTES;\r
+typedef UINT32  EFI_FVB_ATTRIBUTES;\r

 \r
 // \r
 // Attributes bit definitions\r
 \r
 // \r
 // Attributes bit definitions\r


@@ -98,7 +98,7 @@ typedef struct {
   EFI_GUID                  FileSystemGuid;\r
   UINT64                    FvLength;\r
   UINT32                    Signature;\r
   EFI_GUID                  FileSystemGuid;\r
   UINT64                    FvLength;\r
   UINT32                    Signature;\r

-  EFI_FVB2_ATTRIBUTES        Attributes;\r
+  EFI_FVB_ATTRIBUTES        Attributes;\r

   UINT16                    HeaderLength;\r
   UINT16                    Checksum;\r
   UINT16                    ExtHeaderOffset;\r
   UINT16                    HeaderLength;\r
   UINT16                    Checksum;\r
   UINT16                    ExtHeaderOffset;\r

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 59bff01f537b871fd5cbba727a73b0b8999c0c47..da7c46e587e963956b84b0f2f2655110ca8985b0 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -607,7 +607,7 @@ EFI_STATUS
 \r
 **/\r
 typedef struct {\r
 \r
 **/\r
 typedef struct {\r

-  EFI_FVB2_ATTRIBUTES FvAttributes;\r
+  EFI_FVB_ATTRIBUTES  FvAttributes;\r

   EFI_GUID            FvFormat;\r
   EFI_GUID            FvName;\r
   VOID                *FvStart;\r
   EFI_GUID            FvFormat;\r
   EFI_GUID            FvName;\r
   VOID                *FvStart;\r