move header files in MdeModulePkg\Core\Dxe except DxeMain.h into their corresponding...

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVol / FwVolAttrib.c

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
index 34067abc2f30cbfa826046c907c433447b0c4241..f60af526e4ec5231ca66b0670805e7526dd8f4dd 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
@@ -12,15 +12,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <DxeMain.h>\r
+#include "DxeMain.h"\r
+#include "FwVolDriver.h"\r
 \r
 \r
 /**\r
   Retrieves attributes, insures positive polarity of attribute bits, returns\r
   resulting attributes in output parameter.\r
 \r
-  @param  This             Calling context \r
-  @param  Attributes       output buffer which contains attributes \r
+  @param  This             Calling context\r
+  @param  Attributes       output buffer which contains attributes\r
 \r
   @retval EFI_SUCCESS      Successfully got volume attributes\r
 \r
@@ -35,7 +36,7 @@ FvGetVolumeAttributes (
   EFI_STATUS                                Status;\r
   FV_DEVICE                                 *FvDevice;\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL        *Fvb;\r
-  EFI_FVB_ATTRIBUTES                        FvbAttributes;\r
+  EFI_FVB_ATTRIBUTES_2                      FvbAttributes;\r
 \r
   FvDevice = FV_DEVICE_FROM_THIS (This);\r
   Fvb = FvDevice->Fvb;\r
@@ -53,12 +54,12 @@ FvGetVolumeAttributes (
   Status = Fvb->GetAttributes (Fvb, &FvbAttributes);\r
 \r
   //\r
-  // Mask out Fvb bits that are not defined in FV \r
+  // Mask out Fvb bits that are not defined in FV\r
   //\r
   FvbAttributes &= 0xfffff0ff;\r
-  \r
-  *Attributes = (EFI_FV_ATTRIBUTES)FvbAttributes; \r
-  \r
+\r
+  *Attributes = (EFI_FV_ATTRIBUTES)FvbAttributes;\r
+\r
   return Status;\r
 }\r
 \r
@@ -67,9 +68,9 @@ FvGetVolumeAttributes (
 /**\r
   Sets current attributes for volume\r
 \r
-  @param  This             Calling context \r
-  @param  Attributes       At input, contains attributes to be set.  At output \r
-                           contains new value of FV \r
+  @param  This             Calling context\r
+  @param  Attributes       At input, contains attributes to be set.  At output\r
+                           contains new value of FV\r
 \r
   @retval EFI_UNSUPPORTED  Could not be set.\r
 \r
@@ -89,11 +90,11 @@ FvSetVolumeAttributes (
   Return information of type InformationType for the requested firmware\r
   volume.\r
 \r
-  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL. \r
-  @param  InformationType  InformationType for requested. \r
-  @param  BufferSize       On input, size of Buffer.On output, the amount of data \r
-                           returned in Buffer. \r
-  @param  Buffer           A poniter to the data buffer to return. \r
+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
+  @param  InformationType  InformationType for requested.\r
+  @param  BufferSize       On input, size of Buffer.On output, the amount of data\r
+                           returned in Buffer.\r
+  @param  Buffer           A poniter to the data buffer to return.\r
 \r
   @retval EFI_SUCCESS      Successfully got volume Information.\r
 \r
@@ -116,11 +117,11 @@ FvGetVolumeInfo (
   Set information of type InformationType for the requested firmware\r
   volume.\r
 \r
-  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL. \r
-  @param  InformationType  InformationType for requested. \r
-  @param  BufferSize       On input, size of Buffer.On output, the amount of data \r
-                           returned in Buffer. \r
-  @param  Buffer           A poniter to the data buffer to return. \r
+  @param  This             Pointer to EFI_FIRMWARE_VOLUME2_PROTOCOL.\r
+  @param  InformationType  InformationType for requested.\r
+  @param  BufferSize       On input, size of Buffer.On output, the amount of data\r
+                           returned in Buffer.\r
+  @param  Buffer           A poniter to the data buffer to return.\r
 \r
   @retval EFI_SUCCESS      Successfully set volume Information.\r
 \r