Code scrub for DxeCore

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVolBlock / FwVolBlock.c

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index bc234aa0d01080276286375ae3850782e6949fd7..d35292899be034253db0c7a9fdb11095a0875bc2 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
@@ -1,9 +1,8 @@
 /** @file\r
-  Firmware Volume Block protocol.  Consumes FV hobs and creates\r
-  appropriate block protocols.\r
-\r
-  Also consumes NT_NON_MM_FV envinronment variable and produces appropriate\r
-  block protocols fro them also... (this is TBD)\r
+  Implementations for Firmware Volume Block protocol.  \r
+  \r
+  It consumes FV HOBs and creates read-lonly Firmare Volume Block protocol \r
+  instances for each of them.\r
 \r
 Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
 All rights reserved. This program and the accompanying materials\r
@@ -27,16 +26,22 @@ EFI_FW_VOL_BLOCK_DEVICE  mFwVolBlock = {
       {\r
         HARDWARE_DEVICE_PATH,\r
         HW_MEMMAP_DP,\r
-        { (UINT8)(sizeof (MEMMAP_DEVICE_PATH)), (UINT8)(sizeof (MEMMAP_DEVICE_PATH) >> 8) }\r
+        {\r
+          (UINT8)(sizeof (MEMMAP_DEVICE_PATH)),\r
+          (UINT8)(sizeof (MEMMAP_DEVICE_PATH) >> 8)\r
+        }\r
       },\r
       EfiMemoryMappedIO,\r
-      (EFI_PHYSICAL_ADDRESS)0,\r
-      (EFI_PHYSICAL_ADDRESS)0,\r
+      (EFI_PHYSICAL_ADDRESS) 0,\r
+      (EFI_PHYSICAL_ADDRESS) 0,\r
     },\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-      { END_DEVICE_PATH_LENGTH, 0 }      \r
+      { \r
+        END_DEVICE_PATH_LENGTH,\r
+        0\r
+      }      \r
     },\r
   },\r
   {\r
@@ -57,8 +62,6 @@ EFI_FW_VOL_BLOCK_DEVICE  mFwVolBlock = {
 \r
 \r
 \r
-\r
-\r
 /**\r
   Retrieves Volume attributes.  No polarity translations are done.\r
 \r
@@ -195,7 +198,7 @@ FwVolBlockReadBlock (
     return EFI_ACCESS_DENIED;\r
   }\r
   \r
-  LbaIndex = (UINTN)Lba;\r
+  LbaIndex = (UINTN) Lba;\r
   if (LbaIndex >= FvbDevice->NumBlocks) {\r
     //\r
     // Invalid Lba, read nothing.\r
@@ -221,8 +224,8 @@ FwVolBlockReadBlock (
   }\r
   \r
   LbaStart = FvbDevice->LbaCache[LbaIndex].Base;\r
-  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN)FvbDevice->BaseAddress);\r
-  LbaOffset = (UINT8 *)FwVolHeader + LbaStart + Offset;\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN) FvbDevice->BaseAddress);\r
+  LbaOffset = (UINT8 *) FwVolHeader + LbaStart + Offset;\r
 \r
   //\r
   // Perform read operation\r
@@ -412,7 +415,7 @@ ProduceFVBProtocolOnBuffer (
   EFI_FV_BLOCK_MAP_ENTRY        *PtrBlockMapEntry;\r
   \r
   FvAlignment = 0;\r
-  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)BaseAddress;\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN) BaseAddress;\r
   //\r
   // Validate FV Header, if not as expected, return\r
   //\r
@@ -450,8 +453,8 @@ ProduceFVBProtocolOnBuffer (
   //\r
   FvbDev->NumBlocks = 0;\r
   for (PtrBlockMapEntry = FwVolHeader->BlockMap;\r
-        PtrBlockMapEntry->NumBlocks != 0;\r
-        PtrBlockMapEntry++) {\r
+       PtrBlockMapEntry->NumBlocks != 0;\r
+       PtrBlockMapEntry++) {\r
     FvbDev->NumBlocks += PtrBlockMapEntry->NumBlocks;\r
   }\r
   //\r
@@ -468,7 +471,7 @@ ProduceFVBProtocolOnBuffer (
   BlockIndex = 0;\r
   LinearOffset = 0;\r
   for (PtrBlockMapEntry = FwVolHeader->BlockMap;\r
-        PtrBlockMapEntry->NumBlocks != 0; PtrBlockMapEntry++) {\r
+       PtrBlockMapEntry->NumBlocks != 0; PtrBlockMapEntry++) {\r
     for (BlockIndex2 = 0; BlockIndex2 < PtrBlockMapEntry->NumBlocks; BlockIndex2++) {\r
       FvbDev->LbaCache[BlockIndex].Base = LinearOffset;\r
       FvbDev->LbaCache[BlockIndex].Length = PtrBlockMapEntry->Length;\r
@@ -488,12 +491,12 @@ ProduceFVBProtocolOnBuffer (
   // Attach FvVolBlock Protocol to new handle\r
   //\r
   Status = CoreInstallMultipleProtocolInterfaces (\r
-            &FvbDev->Handle,\r
-            &gEfiFirmwareVolumeBlockProtocolGuid,     &FvbDev->FwVolBlockInstance,\r
-            &gEfiDevicePathProtocolGuid,              &FvbDev->DevicePath,\r
-            &gEfiFirmwareVolumeDispatchProtocolGuid,  NULL,\r
-            NULL\r
-            );\r
+             &FvbDev->Handle,\r
+             &gEfiFirmwareVolumeBlockProtocolGuid,     &FvbDev->FwVolBlockInstance,\r
+             &gEfiDevicePathProtocolGuid,              &FvbDev->DevicePath,\r
+             &gEfiFirmwareVolumeDispatchProtocolGuid,  NULL,\r
+             NULL\r
+             );\r
 \r
   //\r
   // If they want the handle back, set it.\r
@@ -527,6 +530,7 @@ FwVolBlockDriverInit (
   )\r
 {\r
   EFI_PEI_HOB_POINTERS          FvHob;\r
+\r
   //\r
   // Core Needs Firmware Volumes to function\r
   //\r
@@ -538,6 +542,7 @@ FwVolBlockDriverInit (
     ProduceFVBProtocolOnBuffer (FvHob.FirmwareVolume->BaseAddress, FvHob.FirmwareVolume->Length, NULL, NULL);    \r
     FvHob.Raw = GET_NEXT_HOB (FvHob);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -587,7 +592,7 @@ CoreProcessFirmwareVolume (
   //\r
   if (!EFI_ERROR(Status)) {\r
     Ptr = NULL;\r
-    Status = CoreHandleProtocol (*FVProtocolHandle, &gEfiFirmwareVolume2ProtocolGuid, (VOID **)&Ptr);\r
+    Status = CoreHandleProtocol (*FVProtocolHandle, &gEfiFirmwareVolume2ProtocolGuid, (VOID **) &Ptr);\r
     if (EFI_ERROR(Status) || (Ptr == NULL)) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r