git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5216 6f19259b...

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index cd0484fc901ee7e08fb3ed24750907b6ebfd50cd..982134165160dd100d800a9a061a57dee92b4d0d 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -38,13 +38,13 @@
 typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL  EFI_FIRMWARE_VOLUME_PROTOCOL;\r
 \r
 //\r
 typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL  EFI_FIRMWARE_VOLUME_PROTOCOL;\r
 \r
 //\r

-// EFI_FV_ATTRIBUTES bit definitions\r
+// FRAMEWORK_EFI_FV_ATTRIBUTES bit definitions\r

 //\r
 //\r

-typedef UINT64  EFI_FV_ATTRIBUTES;\r
+typedef UINT64  FRAMEWORK_EFI_FV_ATTRIBUTES;\r

 \r
 //\r
 // ************************************************************\r
 \r
 //\r
 // ************************************************************\r

-// EFI_FV_ATTRIBUTES bit definitions\r
+// FRAMEWORK_EFI_FV_ATTRIBUTES bit definitions\r

 // ************************************************************\r
 //\r
 #define EFI_FV_READ_DISABLE_CAP       0x0000000000000001ULL\r
 // ************************************************************\r
 //\r
 #define EFI_FV_READ_DISABLE_CAP       0x0000000000000001ULL\r


@@ -94,9 +94,9 @@ typedef UINT64  EFI_FV_ATTRIBUTES;
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_GET_ATTRIBUTES) (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL  *This,\r
-  OUT EFI_FV_ATTRIBUTES             *Attributes\r
+(EFIAPI *FRAMEWORK_EFI_FV_GET_ATTRIBUTES) (\r
+  IN  EFI_FIRMWARE_VOLUME_PROTOCOL            *This,\r
+  OUT FRAMEWORK_EFI_FV_ATTRIBUTES             *Attributes\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -112,9 +112,9 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_SET_ATTRIBUTES) (\r
+(EFIAPI *FRAMEWORK_EFI_FV_SET_ATTRIBUTES) (\r

   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r

-  IN OUT EFI_FV_ATTRIBUTES          *Attributes\r
+  IN OUT FRAMEWORK_EFI_FV_ATTRIBUTES          *Attributes\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -147,7 +147,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_READ_FILE) (\r
+(EFIAPI *FRAMEWORK_EFI_FV_READ_FILE) (\r

   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN EFI_GUID                       *NameGuid,\r
   IN OUT VOID                       **Buffer,\r
   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN EFI_GUID                       *NameGuid,\r
   IN OUT VOID                       **Buffer,\r


@@ -188,7 +188,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_READ_SECTION) (\r
+(EFIAPI *FRAMEWORK_EFI_FV_READ_SECTION) (\r

   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN EFI_GUID                       *NameGuid,\r
   IN EFI_SECTION_TYPE               SectionType,\r
   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN EFI_GUID                       *NameGuid,\r
   IN EFI_SECTION_TYPE               SectionType,\r


@@ -198,10 +198,10 @@ EFI_STATUS
   OUT UINT32                        *AuthenticationStatus\r
   );\r
 \r
   OUT UINT32                        *AuthenticationStatus\r
   );\r
 \r

-typedef UINT32  EFI_FV_WRITE_POLICY;\r
+typedef UINT32  FRAMEWORK_EFI_FV_WRITE_POLICY;\r

 \r
 \r

-#define EFI_FV_UNRELIABLE_WRITE 0x00000000\r
-#define EFI_FV_RELIABLE_WRITE   0x00000001\r
+#define FRAMEWORK_EFI_FV_UNRELIABLE_WRITE 0x00000000\r
+#define FRAMEWORK_EFI_FV_RELIABLE_WRITE   0x00000001\r

 \r
 typedef struct {\r
   EFI_GUID                *NameGuid;\r
 \r
 typedef struct {\r
   EFI_GUID                *NameGuid;\r


@@ -209,7 +209,7 @@ typedef struct {
   EFI_FV_FILE_ATTRIBUTES  FileAttributes;\r
   VOID                    *Buffer;\r
   UINT32                  BufferSize;\r
   EFI_FV_FILE_ATTRIBUTES  FileAttributes;\r
   VOID                    *Buffer;\r
   UINT32                  BufferSize;\r

-} EFI_FV_WRITE_FILE_DATA;\r
+} FRAMEWORK_EFI_FV_WRITE_FILE_DATA;\r

 \r
 /**\r
   Write the supplied file (NameGuid) to the FV.\r
 \r
 /**\r
   Write the supplied file (NameGuid) to the FV.\r


@@ -232,11 +232,11 @@ typedef struct {
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_WRITE_FILE) (\r
-  IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
-  IN UINT32                         NumberOfFiles,\r
-  IN EFI_FV_WRITE_POLICY            WritePolicy,\r
-  IN EFI_FV_WRITE_FILE_DATA         *FileData\r
+(EFIAPI *FRAMEWORK_EFI_FV_WRITE_FILE) (\r
+  IN EFI_FIRMWARE_VOLUME_PROTOCOL             *This,\r
+  IN UINT32                                   NumberOfFiles,\r
+  IN FRAMEWORK_EFI_FV_WRITE_POLICY            WritePolicy,\r
+  IN FRAMEWORK_EFI_FV_WRITE_FILE_DATA         *FileData\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -259,7 +259,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_FV_GET_NEXT_FILE) (\r
+(EFIAPI *FRAMEWORK_EFI_FV_GET_NEXT_FILE) (\r

   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN OUT VOID                       *Key,\r
   IN OUT EFI_FV_FILETYPE            *FileType,\r
   IN EFI_FIRMWARE_VOLUME_PROTOCOL   *This,\r
   IN OUT VOID                       *Key,\r
   IN OUT EFI_FV_FILETYPE            *FileType,\r


@@ -303,12 +303,12 @@ EFI_STATUS
 \r
 **/\r
 struct _EFI_FIRMWARE_VOLUME_PROTOCOL {\r
 \r
 **/\r
 struct _EFI_FIRMWARE_VOLUME_PROTOCOL {\r

-  EFI_FV_GET_ATTRIBUTES GetVolumeAttributes;\r
-  EFI_FV_SET_ATTRIBUTES SetVolumeAttributes;\r
-  EFI_FV_READ_FILE      ReadFile;\r
-  EFI_FV_READ_SECTION   ReadSection;\r
-  EFI_FV_WRITE_FILE     WriteFile;\r
-  EFI_FV_GET_NEXT_FILE  GetNextFile;\r
+  FRAMEWORK_EFI_FV_GET_ATTRIBUTES GetVolumeAttributes;\r
+  FRAMEWORK_EFI_FV_SET_ATTRIBUTES SetVolumeAttributes;\r
+  FRAMEWORK_EFI_FV_READ_FILE      ReadFile;\r
+  FRAMEWORK_EFI_FV_READ_SECTION   ReadSection;\r
+  FRAMEWORK_EFI_FV_WRITE_FILE     WriteFile;\r
+  FRAMEWORK_EFI_FV_GET_NEXT_FILE  GetNextFile;\r

   UINT32                KeySize;\r
   EFI_HANDLE            ParentHandle;\r
 };\r
   UINT32                KeySize;\r
   EFI_HANDLE            ParentHandle;\r
 };\r