\r
#include "NorFlash.h"\r
\r
-extern UINTN mFlashNvStorageVariableBase;\r
+extern UINTN mFlashNvStorageVariableBase;\r
///\r
/// The Firmware Volume Block Protocol is the low-level interface\r
/// to a firmware volume. File-level access to a firmware volume\r
**/\r
EFI_STATUS\r
InitializeFvAndVariableStoreHeaders (\r
- IN NOR_FLASH_INSTANCE *Instance\r
+ IN NOR_FLASH_INSTANCE *Instance\r
)\r
{\r
- EFI_STATUS Status;\r
- VOID* Headers;\r
- UINTN HeadersLength;\r
- EFI_FIRMWARE_VOLUME_HEADER *FirmwareVolumeHeader;\r
- VARIABLE_STORE_HEADER *VariableStoreHeader;\r
- UINT32 NvStorageFtwSpareSize;\r
- UINT32 NvStorageFtwWorkingSize;\r
- UINT32 NvStorageVariableSize;\r
- UINT64 NvStorageFtwSpareBase;\r
- UINT64 NvStorageFtwWorkingBase;\r
- UINT64 NvStorageVariableBase;\r
-\r
- HeadersLength = sizeof(EFI_FIRMWARE_VOLUME_HEADER) + sizeof(EFI_FV_BLOCK_MAP_ENTRY) + sizeof(VARIABLE_STORE_HEADER);\r
- Headers = AllocateZeroPool(HeadersLength);\r
+ EFI_STATUS Status;\r
+ VOID *Headers;\r
+ UINTN HeadersLength;\r
+ EFI_FIRMWARE_VOLUME_HEADER *FirmwareVolumeHeader;\r
+ VARIABLE_STORE_HEADER *VariableStoreHeader;\r
+ UINT32 NvStorageFtwSpareSize;\r
+ UINT32 NvStorageFtwWorkingSize;\r
+ UINT32 NvStorageVariableSize;\r
+ UINT64 NvStorageFtwSpareBase;\r
+ UINT64 NvStorageFtwWorkingBase;\r
+ UINT64 NvStorageVariableBase;\r
+\r
+ HeadersLength = sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY) + sizeof (VARIABLE_STORE_HEADER);\r
+ Headers = AllocateZeroPool (HeadersLength);\r
\r
NvStorageFtwWorkingSize = PcdGet32 (PcdFlashNvStorageFtwWorkingSize);\r
- NvStorageFtwSpareSize = PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
- NvStorageVariableSize = PcdGet32 (PcdFlashNvStorageVariableSize);\r
+ NvStorageFtwSpareSize = PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
+ NvStorageVariableSize = PcdGet32 (PcdFlashNvStorageVariableSize);\r
\r
NvStorageFtwSpareBase = (PcdGet64 (PcdFlashNvStorageFtwSpareBase64) != 0) ?\r
- PcdGet64 (PcdFlashNvStorageFtwSpareBase64) : PcdGet32 (PcdFlashNvStorageFtwSpareBase);\r
+ PcdGet64 (PcdFlashNvStorageFtwSpareBase64) : PcdGet32 (PcdFlashNvStorageFtwSpareBase);\r
NvStorageFtwWorkingBase = (PcdGet64 (PcdFlashNvStorageFtwWorkingBase64) != 0) ?\r
- PcdGet64 (PcdFlashNvStorageFtwWorkingBase64) : PcdGet32 (PcdFlashNvStorageFtwWorkingBase);\r
+ PcdGet64 (PcdFlashNvStorageFtwWorkingBase64) : PcdGet32 (PcdFlashNvStorageFtwWorkingBase);\r
NvStorageVariableBase = (PcdGet64 (PcdFlashNvStorageVariableBase64) != 0) ?\r
- PcdGet64 (PcdFlashNvStorageVariableBase64) : PcdGet32 (PcdFlashNvStorageVariableBase);\r
+ PcdGet64 (PcdFlashNvStorageVariableBase64) : PcdGet32 (PcdFlashNvStorageVariableBase);\r
\r
// FirmwareVolumeHeader->FvLength is declared to have the Variable area AND the FTW working area AND the FTW Spare contiguous.\r
if ((NvStorageVariableBase + NvStorageVariableSize) != NvStorageFtwWorkingBase) {\r
- DEBUG ((DEBUG_ERROR, "%a: NvStorageFtwWorkingBase is not contiguous with NvStorageVariableBase region\n",\r
- __FUNCTION__));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: NvStorageFtwWorkingBase is not contiguous with NvStorageVariableBase region\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if ((NvStorageFtwWorkingBase + NvStorageFtwWorkingSize) != NvStorageFtwSpareBase) {\r
- DEBUG ((DEBUG_ERROR, "%a: NvStorageFtwSpareBase is not contiguous with NvStorageFtwWorkingBase region\n",\r
- __FUNCTION__));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: NvStorageFtwSpareBase is not contiguous with NvStorageFtwWorkingBase region\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
// Check if the size of the area is at least one block size\r
if ((NvStorageVariableSize <= 0) || (NvStorageVariableSize / Instance->Media.BlockSize <= 0)) {\r
- DEBUG ((DEBUG_ERROR, "%a: NvStorageVariableSize is 0x%x, should be atleast one block size\n", __FUNCTION__,\r
- NvStorageVariableSize));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: NvStorageVariableSize is 0x%x, should be atleast one block size\n",\r
+ __FUNCTION__,\r
+ NvStorageVariableSize\r
+ ));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if ((NvStorageFtwWorkingSize <= 0) || (NvStorageFtwWorkingSize / Instance->Media.BlockSize <= 0)) {\r
- DEBUG ((DEBUG_ERROR, "%a: NvStorageFtwWorkingSize is 0x%x, should be atleast one block size\n", __FUNCTION__,\r
- NvStorageFtwWorkingSize));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: NvStorageFtwWorkingSize is 0x%x, should be atleast one block size\n",\r
+ __FUNCTION__,\r
+ NvStorageFtwWorkingSize\r
+ ));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if ((NvStorageFtwSpareSize <= 0) || (NvStorageFtwSpareSize / Instance->Media.BlockSize <= 0)) {\r
- DEBUG ((DEBUG_ERROR, "%a: NvStorageFtwSpareSize is 0x%x, should be atleast one block size\n", __FUNCTION__,\r
- NvStorageFtwSpareSize));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: NvStorageFtwSpareSize is 0x%x, should be atleast one block size\n",\r
+ __FUNCTION__,\r
+ NvStorageFtwSpareSize\r
+ ));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
// Ensure the Variable area Base Addresses are aligned on a block size boundaries\r
if ((NvStorageVariableBase % Instance->Media.BlockSize != 0) ||\r
(NvStorageFtwWorkingBase % Instance->Media.BlockSize != 0) ||\r
- (NvStorageFtwSpareBase % Instance->Media.BlockSize != 0)) {\r
+ (NvStorageFtwSpareBase % Instance->Media.BlockSize != 0))\r
+ {\r
DEBUG ((DEBUG_ERROR, "%a: NvStorage Base addresses must be aligned to block size boundaries", __FUNCTION__));\r
return EFI_INVALID_PARAMETER;\r
}\r
//\r
// EFI_FIRMWARE_VOLUME_HEADER\r
//\r
- FirmwareVolumeHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Headers;\r
+ FirmwareVolumeHeader = (EFI_FIRMWARE_VOLUME_HEADER *)Headers;\r
CopyGuid (&FirmwareVolumeHeader->FileSystemGuid, &gEfiSystemNvDataFvGuid);\r
FirmwareVolumeHeader->FvLength =\r
- PcdGet32(PcdFlashNvStorageVariableSize) +\r
- PcdGet32(PcdFlashNvStorageFtwWorkingSize) +\r
- PcdGet32(PcdFlashNvStorageFtwSpareSize);\r
- FirmwareVolumeHeader->Signature = EFI_FVH_SIGNATURE;\r
- FirmwareVolumeHeader->Attributes = (EFI_FVB_ATTRIBUTES_2) (\r
- EFI_FVB2_READ_ENABLED_CAP | // Reads may be enabled\r
- EFI_FVB2_READ_STATUS | // Reads are currently enabled\r
- EFI_FVB2_STICKY_WRITE | // A block erase is required to flip bits into EFI_FVB2_ERASE_POLARITY\r
- EFI_FVB2_MEMORY_MAPPED | // It is memory mapped\r
- EFI_FVB2_ERASE_POLARITY | // After erasure all bits take this value (i.e. '1')\r
- EFI_FVB2_WRITE_STATUS | // Writes are currently enabled\r
- EFI_FVB2_WRITE_ENABLED_CAP // Writes may be enabled\r
- );\r
- FirmwareVolumeHeader->HeaderLength = sizeof(EFI_FIRMWARE_VOLUME_HEADER) + sizeof(EFI_FV_BLOCK_MAP_ENTRY);\r
- FirmwareVolumeHeader->Revision = EFI_FVH_REVISION;\r
+ PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+ PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+ PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
+ FirmwareVolumeHeader->Signature = EFI_FVH_SIGNATURE;\r
+ FirmwareVolumeHeader->Attributes = (EFI_FVB_ATTRIBUTES_2)(\r
+ EFI_FVB2_READ_ENABLED_CAP | // Reads may be enabled\r
+ EFI_FVB2_READ_STATUS | // Reads are currently enabled\r
+ EFI_FVB2_STICKY_WRITE | // A block erase is required to flip bits into EFI_FVB2_ERASE_POLARITY\r
+ EFI_FVB2_MEMORY_MAPPED | // It is memory mapped\r
+ EFI_FVB2_ERASE_POLARITY | // After erasure all bits take this value (i.e. '1')\r
+ EFI_FVB2_WRITE_STATUS | // Writes are currently enabled\r
+ EFI_FVB2_WRITE_ENABLED_CAP // Writes may be enabled\r
+ );\r
+ FirmwareVolumeHeader->HeaderLength = sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY);\r
+ FirmwareVolumeHeader->Revision = EFI_FVH_REVISION;\r
FirmwareVolumeHeader->BlockMap[0].NumBlocks = Instance->Media.LastBlock + 1;\r
- FirmwareVolumeHeader->BlockMap[0].Length = Instance->Media.BlockSize;\r
+ FirmwareVolumeHeader->BlockMap[0].Length = Instance->Media.BlockSize;\r
FirmwareVolumeHeader->BlockMap[1].NumBlocks = 0;\r
- FirmwareVolumeHeader->BlockMap[1].Length = 0;\r
- FirmwareVolumeHeader->Checksum = CalculateCheckSum16 ((UINT16*)FirmwareVolumeHeader,FirmwareVolumeHeader->HeaderLength);\r
+ FirmwareVolumeHeader->BlockMap[1].Length = 0;\r
+ FirmwareVolumeHeader->Checksum = CalculateCheckSum16 ((UINT16 *)FirmwareVolumeHeader, FirmwareVolumeHeader->HeaderLength);\r
\r
//\r
// VARIABLE_STORE_HEADER\r
//\r
- VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)Headers + FirmwareVolumeHeader->HeaderLength);\r
+ VariableStoreHeader = (VARIABLE_STORE_HEADER *)((UINTN)Headers + FirmwareVolumeHeader->HeaderLength);\r
CopyGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid);\r
- VariableStoreHeader->Size = PcdGet32(PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength;\r
- VariableStoreHeader->Format = VARIABLE_STORE_FORMATTED;\r
- VariableStoreHeader->State = VARIABLE_STORE_HEALTHY;\r
+ VariableStoreHeader->Size = PcdGet32 (PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength;\r
+ VariableStoreHeader->Format = VARIABLE_STORE_FORMATTED;\r
+ VariableStoreHeader->State = VARIABLE_STORE_HEALTHY;\r
\r
// Install the combined super-header in the NorFlash\r
Status = FvbWrite (&Instance->FvbProtocol, 0, 0, &HeadersLength, Headers);\r
**/\r
EFI_STATUS\r
ValidateFvHeader (\r
- IN NOR_FLASH_INSTANCE *Instance\r
+ IN NOR_FLASH_INSTANCE *Instance\r
)\r
{\r
UINT16 Checksum;\r
UINTN VariableStoreLength;\r
UINTN FvLength;\r
\r
- FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress;\r
+ FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)Instance->RegionBaseAddress;\r
\r
- FvLength = PcdGet32(PcdFlashNvStorageVariableSize) + PcdGet32(PcdFlashNvStorageFtwWorkingSize) +\r
- PcdGet32(PcdFlashNvStorageFtwSpareSize);\r
+ FvLength = PcdGet32 (PcdFlashNvStorageVariableSize) + PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+ PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
\r
//\r
// Verify the header revision, header signature, length\r
// Length of FvBlock cannot be 2**64-1\r
// HeaderLength cannot be an odd number\r
//\r
- if ( (FwVolHeader->Revision != EFI_FVH_REVISION)\r
- || (FwVolHeader->Signature != EFI_FVH_SIGNATURE)\r
- || (FwVolHeader->FvLength != FvLength)\r
- )\r
+ if ( (FwVolHeader->Revision != EFI_FVH_REVISION)\r
+ || (FwVolHeader->Signature != EFI_FVH_SIGNATURE)\r
+ || (FwVolHeader->FvLength != FvLength)\r
+ )\r
{\r
- DEBUG ((DEBUG_INFO, "%a: No Firmware Volume header present\n",\r
- __FUNCTION__));\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "%a: No Firmware Volume header present\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_NOT_FOUND;\r
}\r
\r
// Check the Firmware Volume Guid\r
- if( CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiSystemNvDataFvGuid) == FALSE ) {\r
- DEBUG ((DEBUG_INFO, "%a: Firmware Volume Guid non-compatible\n",\r
- __FUNCTION__));\r
+ if ( CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiSystemNvDataFvGuid) == FALSE ) {\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "%a: Firmware Volume Guid non-compatible\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_NOT_FOUND;\r
}\r
\r
// Verify the header checksum\r
- Checksum = CalculateSum16((UINT16*)FwVolHeader, FwVolHeader->HeaderLength);\r
+ Checksum = CalculateSum16 ((UINT16 *)FwVolHeader, FwVolHeader->HeaderLength);\r
if (Checksum != 0) {\r
- DEBUG ((DEBUG_INFO, "%a: FV checksum is invalid (Checksum:0x%X)\n",\r
- __FUNCTION__, Checksum));\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "%a: FV checksum is invalid (Checksum:0x%X)\n",\r
+ __FUNCTION__,\r
+ Checksum\r
+ ));\r
return EFI_NOT_FOUND;\r
}\r
\r
- VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)FwVolHeader + FwVolHeader->HeaderLength);\r
+ VariableStoreHeader = (VARIABLE_STORE_HEADER *)((UINTN)FwVolHeader + FwVolHeader->HeaderLength);\r
\r
// Check the Variable Store Guid\r
if (!CompareGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid) &&\r
- !CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid)) {\r
- DEBUG ((DEBUG_INFO, "%a: Variable Store Guid non-compatible\n",\r
- __FUNCTION__));\r
+ !CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "%a: Variable Store Guid non-compatible\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_NOT_FOUND;\r
}\r
\r
VariableStoreLength = PcdGet32 (PcdFlashNvStorageVariableSize) - FwVolHeader->HeaderLength;\r
if (VariableStoreHeader->Size != VariableStoreLength) {\r
- DEBUG ((DEBUG_INFO, "%a: Variable Store Length does not match\n",\r
- __FUNCTION__));\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "%a: Variable Store Length does not match\n",\r
+ __FUNCTION__\r
+ ));\r
return EFI_NOT_FOUND;\r
}\r
\r
**/\r
EFI_STATUS\r
EFIAPI\r
-FvbGetAttributes(\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
- OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
+FvbGetAttributes (\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
+ OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
{\r
EFI_FVB_ATTRIBUTES_2 FlashFvbAttributes;\r
- NOR_FLASH_INSTANCE *Instance;\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
- Instance = INSTANCE_FROM_FVB_THIS(This);\r
+ Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
- FlashFvbAttributes = (EFI_FVB_ATTRIBUTES_2) (\r
+ FlashFvbAttributes = (EFI_FVB_ATTRIBUTES_2)(\r
\r
- EFI_FVB2_READ_ENABLED_CAP | // Reads may be enabled\r
- EFI_FVB2_READ_STATUS | // Reads are currently enabled\r
- EFI_FVB2_STICKY_WRITE | // A block erase is required to flip bits into EFI_FVB2_ERASE_POLARITY\r
- EFI_FVB2_MEMORY_MAPPED | // It is memory mapped\r
- EFI_FVB2_ERASE_POLARITY // After erasure all bits take this value (i.e. '1')\r
+ EFI_FVB2_READ_ENABLED_CAP | // Reads may be enabled\r
+ EFI_FVB2_READ_STATUS | // Reads are currently enabled\r
+ EFI_FVB2_STICKY_WRITE | // A block erase is required to flip bits into EFI_FVB2_ERASE_POLARITY\r
+ EFI_FVB2_MEMORY_MAPPED | // It is memory mapped\r
+ EFI_FVB2_ERASE_POLARITY // After erasure all bits take this value (i.e. '1')\r
\r
- );\r
+ );\r
\r
// Check if it is write protected\r
if (Instance->Media.ReadOnly != TRUE) {\r
-\r
FlashFvbAttributes = FlashFvbAttributes |\r
EFI_FVB2_WRITE_STATUS | // Writes are currently enabled\r
EFI_FVB2_WRITE_ENABLED_CAP; // Writes may be enabled\r
**/\r
EFI_STATUS\r
EFIAPI\r
-FvbSetAttributes(\r
+FvbSetAttributes (\r
IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes\r
)\r
{\r
- DEBUG ((DEBUG_BLKIO, "FvbSetAttributes(0x%X) is not supported\n",*Attributes));\r
+ DEBUG ((DEBUG_BLKIO, "FvbSetAttributes(0x%X) is not supported\n", *Attributes));\r
return EFI_UNSUPPORTED;\r
}\r
\r
OUT EFI_PHYSICAL_ADDRESS *Address\r
)\r
{\r
- NOR_FLASH_INSTANCE *Instance;\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
- Instance = INSTANCE_FROM_FVB_THIS(This);\r
+ Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
DEBUG ((DEBUG_BLKIO, "FvbGetPhysicalAddress(BaseAddress=0x%08x)\n", Instance->RegionBaseAddress));\r
\r
- ASSERT(Address != NULL);\r
+ ASSERT (Address != NULL);\r
\r
*Address = mFlashNvStorageVariableBase;\r
return EFI_SUCCESS;\r
OUT UINTN *NumberOfBlocks\r
)\r
{\r
- EFI_STATUS Status;\r
- NOR_FLASH_INSTANCE *Instance;\r
+ EFI_STATUS Status;\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
- Instance = INSTANCE_FROM_FVB_THIS(This);\r
+ Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
DEBUG ((DEBUG_BLKIO, "FvbGetBlockSize(Lba=%ld, BlockSize=0x%x, LastBlock=%ld)\n", Lba, Instance->Media.BlockSize, Instance->Media.LastBlock));\r
\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
// This is easy because in this platform each NorFlash device has equal sized blocks.\r
- *BlockSize = (UINTN) Instance->Media.BlockSize;\r
- *NumberOfBlocks = (UINTN) (Instance->Media.LastBlock - Lba + 1);\r
+ *BlockSize = (UINTN)Instance->Media.BlockSize;\r
+ *NumberOfBlocks = (UINTN)(Instance->Media.LastBlock - Lba + 1);\r
\r
DEBUG ((DEBUG_BLKIO, "FvbGetBlockSize: *BlockSize=0x%x, *NumberOfBlocks=0x%x.\n", *BlockSize, *NumberOfBlocks));\r
\r
EFI_STATUS\r
EFIAPI\r
FvbRead (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN OUT UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN OUT UINT8 *Buffer\r
)\r
{\r
- EFI_STATUS TempStatus;\r
- UINTN BlockSize;\r
- NOR_FLASH_INSTANCE *Instance;\r
+ EFI_STATUS TempStatus;\r
+ UINTN BlockSize;\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
- Instance = INSTANCE_FROM_FVB_THIS(This);\r
+ Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
DEBUG ((DEBUG_BLKIO, "FvbRead(Parameters: Lba=%ld, Offset=0x%x, *NumBytes=0x%x, Buffer @ 0x%08x)\n", Instance->StartLba + Lba, Offset, *NumBytes, Buffer));\r
\r
// Cache the block size to avoid de-referencing pointers all the time\r
BlockSize = Instance->Media.BlockSize;\r
\r
- DEBUG ((DEBUG_BLKIO, "FvbRead: Check if (Offset=0x%x + NumBytes=0x%x) <= BlockSize=0x%x\n", Offset, *NumBytes, BlockSize ));\r
+ DEBUG ((DEBUG_BLKIO, "FvbRead: Check if (Offset=0x%x + NumBytes=0x%x) <= BlockSize=0x%x\n", Offset, *NumBytes, BlockSize));\r
\r
// The read must not span block boundaries.\r
// We need to check each variable individually because adding two large values together overflows.\r
if ((Offset >= BlockSize) ||\r
(*NumBytes > BlockSize) ||\r
- ((Offset + *NumBytes) > BlockSize)) {\r
- DEBUG ((DEBUG_ERROR, "FvbRead: ERROR - EFI_BAD_BUFFER_SIZE: (Offset=0x%x + NumBytes=0x%x) > BlockSize=0x%x\n", Offset, *NumBytes, BlockSize ));\r
+ ((Offset + *NumBytes) > BlockSize))\r
+ {\r
+ DEBUG ((DEBUG_ERROR, "FvbRead: ERROR - EFI_BAD_BUFFER_SIZE: (Offset=0x%x + NumBytes=0x%x) > BlockSize=0x%x\n", Offset, *NumBytes, BlockSize));\r
return EFI_BAD_BUFFER_SIZE;\r
}\r
\r
return EFI_DEVICE_ERROR;\r
}\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
FvbWrite (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
- IN EFI_LBA Lba,\r
- IN UINTN Offset,\r
- IN OUT UINTN *NumBytes,\r
- IN UINT8 *Buffer\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
+ IN EFI_LBA Lba,\r
+ IN UINTN Offset,\r
+ IN OUT UINTN *NumBytes,\r
+ IN UINT8 *Buffer\r
)\r
{\r
- NOR_FLASH_INSTANCE *Instance;\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
EFI_STATUS\r
EFIAPI\r
FvbEraseBlocks (\r
- IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
+ IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
...\r
)\r
{\r
- EFI_STATUS Status;\r
- VA_LIST Args;\r
- UINTN BlockAddress; // Physical address of Lba to erase\r
- EFI_LBA StartingLba; // Lba from which we start erasing\r
- UINTN NumOfLba; // Number of Lba blocks to erase\r
- NOR_FLASH_INSTANCE *Instance;\r
+ EFI_STATUS Status;\r
+ VA_LIST Args;\r
+ UINTN BlockAddress; // Physical address of Lba to erase\r
+ EFI_LBA StartingLba; // Lba from which we start erasing\r
+ UINTN NumOfLba; // Number of Lba blocks to erase\r
+ NOR_FLASH_INSTANCE *Instance;\r
\r
- Instance = INSTANCE_FROM_FVB_THIS(This);\r
+ Instance = INSTANCE_FROM_FVB_THIS (This);\r
\r
DEBUG ((DEBUG_BLKIO, "FvbEraseBlocks()\n"));\r
\r
\r
// Have we reached the end of the list?\r
if (StartingLba == EFI_LBA_LIST_TERMINATOR) {\r
- //Exit the while loop\r
+ // Exit the while loop\r
break;\r
}\r
\r
goto EXIT;\r
}\r
} while (TRUE);\r
+\r
VA_END (Args);\r
\r
//\r
\r
// Go through each one and erase it\r
while (NumOfLba > 0) {\r
-\r
// Get the physical address of Lba to erase\r
BlockAddress = GET_NOR_BLOCK_ADDRESS (\r
- Instance->RegionBaseAddress,\r
- Instance->StartLba + StartingLba,\r
- Instance->Media.BlockSize\r
- );\r
+ Instance->RegionBaseAddress,\r
+ Instance->StartLba + StartingLba,\r
+ Instance->Media.BlockSize\r
+ );\r
\r
// Erase it\r
DEBUG ((DEBUG_BLKIO, "FvbEraseBlocks: Erasing Lba=%ld @ 0x%08x.\n", Instance->StartLba + StartingLba, BlockAddress));\r
Status = NorFlashUnlockAndEraseSingleBlock (Instance, BlockAddress);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
VA_END (Args);\r
Status = EFI_DEVICE_ERROR;\r
goto EXIT;\r
NumOfLba--;\r
}\r
} while (TRUE);\r
+\r
VA_END (Args);\r
\r
EXIT:\r
VOID\r
EFIAPI\r
FvbVirtualNotifyEvent (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EfiConvertPointer (0x0, (VOID**)&mFlashNvStorageVariableBase);\r
+ EfiConvertPointer (0x0, (VOID **)&mFlashNvStorageVariableBase);\r
return;\r
}\r
projects / mirror_edk2.git / blobdiff