\r
/** Macro defining the maximum number of Flash devices.\r
*/\r
-#define MAX_FLASH_DEVICES 4\r
+#define MAX_FLASH_DEVICES 4\r
\r
/** Macro defining the cfi-flash label describing the UEFI variable store.\r
*/\r
-#define LABEL_UEFI_VAR_STORE "System-firmware"\r
+#define LABEL_UEFI_VAR_STORE "System-firmware"\r
\r
STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_DEVICES];\r
STATIC UINTN mNorFlashDeviceCount = 0;\r
-STATIC INT32 mUefiVarStoreNode = MAX_INT32;\r
+STATIC INT32 mUefiVarStoreNode = MAX_INT32;\r
STATIC FDT_CLIENT_PROTOCOL *mFdtClient;\r
\r
/** This function performs platform specific actions to initialise\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
DEBUG ((DEBUG_INFO, "NorFlashPlatformInitialization\n"));\r
\r
STATIC\r
EFI_STATUS\r
SetupVariableStore (\r
- IN NOR_FLASH_DESCRIPTION * FlashDevice\r
+ IN NOR_FLASH_DESCRIPTION *FlashDevice\r
)\r
{\r
- UINTN FlashRegion;\r
- UINTN FlashNvStorageVariableBase;\r
- UINTN FlashNvStorageFtwWorkingBase;\r
- UINTN FlashNvStorageFtwSpareBase;\r
- UINTN FlashNvStorageVariableSize;\r
- UINTN FlashNvStorageFtwWorkingSize;\r
- UINTN FlashNvStorageFtwSpareSize;\r
-\r
- FlashNvStorageVariableSize = PcdGet32 (PcdFlashNvStorageVariableSize);\r
+ UINTN FlashRegion;\r
+ UINTN FlashNvStorageVariableBase;\r
+ UINTN FlashNvStorageFtwWorkingBase;\r
+ UINTN FlashNvStorageFtwSpareBase;\r
+ UINTN FlashNvStorageVariableSize;\r
+ UINTN FlashNvStorageFtwWorkingSize;\r
+ UINTN FlashNvStorageFtwSpareSize;\r
+\r
+ FlashNvStorageVariableSize = PcdGet32 (PcdFlashNvStorageVariableSize);\r
FlashNvStorageFtwWorkingSize = PcdGet32 (PcdFlashNvStorageFtwWorkingSize);\r
- FlashNvStorageFtwSpareSize = PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
+ FlashNvStorageFtwSpareSize = PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
\r
if ((FlashNvStorageVariableSize == 0) ||\r
(FlashNvStorageFtwWorkingSize == 0) ||\r
- (FlashNvStorageFtwSpareSize == 0)) {\r
+ (FlashNvStorageFtwSpareSize == 0))\r
+ {\r
DEBUG ((DEBUG_ERROR, "FlashNvStorage size not defined\n"));\r
return EFI_INVALID_PARAMETER;\r
}\r
FlashRegion = FlashDevice->DeviceBaseAddress;\r
\r
FlashNvStorageVariableBase = FlashRegion;\r
- FlashRegion += PcdGet32 (PcdFlashNvStorageVariableSize);\r
+ FlashRegion += PcdGet32 (PcdFlashNvStorageVariableSize);\r
\r
FlashNvStorageFtwWorkingBase = FlashRegion;\r
- FlashRegion += PcdGet32 (PcdFlashNvStorageFtwWorkingSize);\r
+ FlashRegion += PcdGet32 (PcdFlashNvStorageFtwWorkingSize);\r
\r
FlashNvStorageFtwSpareBase = FlashRegion;\r
- FlashRegion += PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
+ FlashRegion += PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
\r
if (FlashRegion > (FlashDevice->DeviceBaseAddress + FlashDevice->Size)) {\r
DEBUG ((DEBUG_ERROR, "Insufficient flash storage size\n"));\r
**/\r
EFI_STATUS\r
NorFlashPlatformGetDevices (\r
- OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions,\r
- OUT UINT32 *Count\r
+ OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions,\r
+ OUT UINT32 *Count\r
)\r
{\r
if (mNorFlashDeviceCount > 0) {\r
*NorFlashDescriptions = mNorFlashDevices;\r
- *Count = mNorFlashDeviceCount;\r
+ *Count = mNorFlashDeviceCount;\r
return EFI_SUCCESS;\r
}\r
+\r
return EFI_NOT_FOUND;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
NorFlashPlatformLibConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE * SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- INT32 Node;\r
- EFI_STATUS Status;\r
- EFI_STATUS FindNodeStatus;\r
- CONST UINT32 *Reg;\r
- UINT32 PropSize;\r
- UINT64 Base;\r
- UINT64 Size;\r
- UINTN UefiVarStoreIndex;\r
- CONST CHAR8 *Label;\r
- UINT32 LabelLen;\r
+ INT32 Node;\r
+ EFI_STATUS Status;\r
+ EFI_STATUS FindNodeStatus;\r
+ CONST UINT32 *Reg;\r
+ UINT32 PropSize;\r
+ UINT64 Base;\r
+ UINT64 Size;\r
+ UINTN UefiVarStoreIndex;\r
+ CONST CHAR8 *Label;\r
+ UINT32 LabelLen;\r
\r
if (mNorFlashDeviceCount != 0) {\r
return EFI_SUCCESS;\r
&Node\r
);\r
!EFI_ERROR (FindNodeStatus) &&\r
- (mNorFlashDeviceCount < MAX_FLASH_DEVICES);\r
+ (mNorFlashDeviceCount < MAX_FLASH_DEVICES);\r
FindNodeStatus = mFdtClient->FindNextCompatibleNode (\r
mFdtClient,\r
"cfi-flash",\r
Node,\r
&Node\r
- )) {\r
+ ))\r
+ {\r
Status = mFdtClient->GetNodeProperty (\r
mFdtClient,\r
Node,\r
&PropSize\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",\r
- __FUNCTION__, Status));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: GetNodeProperty () failed (Status == %r)\n",\r
+ __FUNCTION__,\r
+ Status\r
+ ));\r
continue;\r
}\r
\r
ASSERT ((PropSize % (4 * sizeof (UINT32))) == 0);\r
\r
while ((PropSize >= (4 * sizeof (UINT32))) &&\r
- (mNorFlashDeviceCount < MAX_FLASH_DEVICES)) {\r
+ (mNorFlashDeviceCount < MAX_FLASH_DEVICES))\r
+ {\r
Base = SwapBytes64 (ReadUnaligned64 ((VOID *)&Reg[0]));\r
Size = SwapBytes64 (ReadUnaligned64 ((VOID *)&Reg[2]));\r
Reg += 4;\r
// The firmware is not updatable from inside the guest anyway.\r
//\r
if ((PcdGet64 (PcdFvBaseAddress) + PcdGet32 (PcdFvSize) > Base) &&\r
- (Base + Size) > PcdGet64 (PcdFvBaseAddress)) {\r
+ ((Base + Size) > PcdGet64 (PcdFvBaseAddress)))\r
+ {\r
continue;\r
}\r
\r
\r
mNorFlashDevices[mNorFlashDeviceCount].DeviceBaseAddress = (UINTN)Base;\r
mNorFlashDevices[mNorFlashDeviceCount].RegionBaseAddress = (UINTN)Base;\r
- mNorFlashDevices[mNorFlashDeviceCount].Size = (UINTN)Size;\r
- mNorFlashDevices[mNorFlashDeviceCount].BlockSize = KVMTOOL_NOR_BLOCK_SIZE;\r
+ mNorFlashDevices[mNorFlashDeviceCount].Size = (UINTN)Size;\r
+ mNorFlashDevices[mNorFlashDeviceCount].BlockSize = KVMTOOL_NOR_BLOCK_SIZE;\r
mNorFlashDeviceCount++;\r
}\r
} // for\r
UefiVarStoreIndex = mNorFlashDeviceCount - 1;\r
mUefiVarStoreNode = Node;\r
}\r
+\r
if (mNorFlashDevices[UefiVarStoreIndex].DeviceBaseAddress != 0) {\r
return SetupVariableStore (&mNorFlashDevices[UefiVarStoreIndex]);\r
}\r