\r
#include "FvSimpleFileSystemInternal.h"\r
\r
-EFI_UNICODE_COLLATION_PROTOCOL *mUnicodeCollation = NULL;\r
+EFI_UNICODE_COLLATION_PROTOCOL *mUnicodeCollation = NULL;\r
\r
//\r
// A Guid string is 32 hex characters with 4 hyphens and a NULL-terminated char: 37 characters total\r
//\r
-#define GUID_STRING_SIZE (37 * sizeof (CHAR16))\r
+#define GUID_STRING_SIZE (37 * sizeof (CHAR16))\r
\r
-#define FVFS_VOLUME_LABEL_PREFIX L"Firmware Volume: "\r
-#define FVFS_VOLUME_LABEL_SIZE (sizeof (FVFS_VOLUME_LABEL_PREFIX) + GUID_STRING_SIZE - sizeof (CHAR16))\r
-#define FVFS_FALLBACK_VOLUME_LABEL L"Firmware Volume"\r
+#define FVFS_VOLUME_LABEL_PREFIX L"Firmware Volume: "\r
+#define FVFS_VOLUME_LABEL_SIZE (sizeof (FVFS_VOLUME_LABEL_PREFIX) + GUID_STRING_SIZE - sizeof (CHAR16))\r
+#define FVFS_FALLBACK_VOLUME_LABEL L"Firmware Volume"\r
\r
//\r
// Template for EFI_SIMPLE_FILE_SYSTEM_PROTOCOL data structure.\r
//\r
-EFI_SIMPLE_FILE_SYSTEM_PROTOCOL mSimpleFsTemplate = {\r
+EFI_SIMPLE_FILE_SYSTEM_PROTOCOL mSimpleFsTemplate = {\r
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION,\r
FvSimpleFileSystemOpenVolume\r
};\r
//\r
// Template for EFI_DRIVER_BINDING_PROTOCOL data structure.\r
//\r
-EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {\r
FvSimpleFileSystemDriverSupported,\r
FvSimpleFileSystemDriverStart,\r
FvSimpleFileSystemDriverStop,\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemOpenVolume (\r
- IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **RootFile\r
+ IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **RootFile\r
)\r
{\r
- EFI_STATUS Status;\r
- FV_FILESYSTEM_FILE *Root;\r
- CHAR16 *UiSection;\r
- EFI_GUID NameGuid;\r
- EFI_FV_FILE_ATTRIBUTES Attributes;\r
- UINT32 Authentication;\r
- UINTN Key;\r
- EFI_FV_FILETYPE FileType;\r
- UINTN Size;\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE_INFO *FvFileInfo;\r
- EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol;\r
- CHAR16 *Name;\r
- UINTN NameLen;\r
- UINTN NumChars;\r
- UINTN DestMax;\r
+ EFI_STATUS Status;\r
+ FV_FILESYSTEM_FILE *Root;\r
+ CHAR16 *UiSection;\r
+ EFI_GUID NameGuid;\r
+ EFI_FV_FILE_ATTRIBUTES Attributes;\r
+ UINT32 Authentication;\r
+ UINTN Key;\r
+ EFI_FV_FILETYPE FileType;\r
+ UINTN Size;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE_INFO *FvFileInfo;\r
+ EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol;\r
+ CHAR16 *Name;\r
+ UINTN NameLen;\r
+ UINTN NumChars;\r
+ UINTN DestMax;\r
\r
Instance = FVFS_INSTANCE_FROM_SIMPLE_FS_THIS (This);\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
if (Instance->Root == NULL) {\r
//\r
CopyMem (&Root->FileProtocol, &mFileSystemTemplate, sizeof (mFileSystemTemplate));\r
Root->FvFileInfo = AllocateZeroPool (sizeof (FV_FILESYSTEM_FILE_INFO));\r
if (Root->FvFileInfo == NULL) {\r
- return EFI_OUT_OF_RESOURCES;\r
+ return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
Root->FvFileInfo->FileInfo.Size = sizeof (EFI_FILE_INFO);\r
Root->FvFileInfo->FileInfo.Attribute = EFI_FILE_DIRECTORY | EFI_FILE_READ_ONLY;\r
\r
// its NameGuid.\r
//\r
UiSection = NULL;\r
- Status = FvProtocol->ReadSection (\r
- FvProtocol,\r
- &NameGuid,\r
- EFI_SECTION_USER_INTERFACE,\r
- 0,\r
- (VOID **)&UiSection,\r
- &Size,\r
- &Authentication\r
- );\r
+ Status = FvProtocol->ReadSection (\r
+ FvProtocol,\r
+ &NameGuid,\r
+ EFI_SECTION_USER_INTERFACE,\r
+ 0,\r
+ (VOID **)&UiSection,\r
+ &Size,\r
+ &Authentication\r
+ );\r
if (!EFI_ERROR (Status)) {\r
Name = UiSection;\r
} else {\r
if (Name == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
NumChars = UnicodeSPrint (Name, GUID_STRING_SIZE, L"%g", &NameGuid);\r
ASSERT ((NumChars + 1) * sizeof (CHAR16) == GUID_STRING_SIZE);\r
}\r
ASSERT_EFI_ERROR (Status);\r
\r
if (FV_FILETYPE_IS_EXECUTABLE (FileType)) {\r
- Status = StrnCatS (&FvFileInfo->FileInfo.FileName[0], DestMax, L".efi", StrLen (L".efi"));\r
+ Status = StrnCatS (&FvFileInfo->FileInfo.FileName[0], DestMax, L".efi", StrLen (L".efi"));\r
ASSERT_EFI_ERROR (Status);\r
}\r
\r
- FvFileInfo->FileInfo.Size = sizeof (EFI_FILE_INFO) + NameLen - sizeof (CHAR16);\r
- Status = FvFsGetFileSize (FvProtocol, FvFileInfo);\r
+ FvFileInfo->FileInfo.Size = sizeof (EFI_FILE_INFO) + NameLen - sizeof (CHAR16);\r
+ Status = FvFsGetFileSize (FvProtocol, FvFileInfo);\r
ASSERT_EFI_ERROR (Status);\r
FvFileInfo->FileInfo.PhysicalSize = FvFileInfo->FileInfo.FileSize;\r
FvFileInfo->FileInfo.Attribute = EFI_FILE_READ_ONLY;\r
InsertHeadList (&Instance->FileInfoHead, &FvFileInfo->Link);\r
\r
FreePool (Name);\r
-\r
} while (TRUE);\r
\r
if (Status == EFI_NOT_FOUND) {\r
**/\r
EFI_STATUS\r
InitializeUnicodeCollationSupportWorker (\r
- IN EFI_HANDLE AgentHandle,\r
- IN EFI_GUID *ProtocolGuid,\r
- IN CONST CHAR16 *VariableName,\r
- IN CONST CHAR8 *DefaultLanguage\r
+ IN EFI_HANDLE AgentHandle,\r
+ IN EFI_GUID *ProtocolGuid,\r
+ IN CONST CHAR16 *VariableName,\r
+ IN CONST CHAR8 *DefaultLanguage\r
)\r
{\r
EFI_STATUS ReturnStatus;\r
return Status;\r
}\r
\r
- Iso639Language = (BOOLEAN) (ProtocolGuid == &gEfiUnicodeCollationProtocolGuid);\r
- GetEfiGlobalVariable2 (VariableName, (VOID**) &Language, NULL);\r
+ Iso639Language = (BOOLEAN)(ProtocolGuid == &gEfiUnicodeCollationProtocolGuid);\r
+ GetEfiGlobalVariable2 (VariableName, (VOID **)&Language, NULL);\r
\r
ReturnStatus = EFI_UNSUPPORTED;\r
for (Index = 0; Index < NumHandles; Index++) {\r
Status = gBS->OpenProtocol (\r
Handles[Index],\r
ProtocolGuid,\r
- (VOID **) &Uci,\r
+ (VOID **)&Uci,\r
AgentHandle,\r
NULL,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
if (BestLanguage != NULL) {\r
FreePool (BestLanguage);\r
mUnicodeCollation = Uci;\r
- ReturnStatus = EFI_SUCCESS;\r
+ ReturnStatus = EFI_SUCCESS;\r
break;\r
}\r
}\r
**/\r
EFI_STATUS\r
InitializeUnicodeCollationSupport (\r
- IN EFI_HANDLE AgentHandle\r
+ IN EFI_HANDLE AgentHandle\r
)\r
{\r
-\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = EFI_UNSUPPORTED;\r
\r
AgentHandle,\r
&gEfiUnicodeCollation2ProtocolGuid,\r
L"PlatformLang",\r
- (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
+ (CONST CHAR8 *)PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
);\r
//\r
// If the attempt to use Unicode Collation 2 Protocol fails, then we fall back\r
AgentHandle,\r
&gEfiUnicodeCollationProtocolGuid,\r
L"Lang",\r
- (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultLang)\r
+ (CONST CHAR8 *)PcdGetPtr (PcdUefiVariableDefaultLang)\r
);\r
}\r
\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol;\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- EFI_DEVICE_PATH_PROTOCOL *FvDevicePath;\r
- EFI_GUID *FvGuid;\r
- UINTN NumChars;\r
+ EFI_STATUS Status;\r
+ EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ EFI_DEVICE_PATH_PROTOCOL *FvDevicePath;\r
+ EFI_GUID *FvGuid;\r
+ UINTN NumChars;\r
\r
Status = InitializeUnicodeCollationSupport (DriverBinding->DriverBindingHandle);\r
if (EFI_ERROR (Status)) {\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiFirmwareVolume2ProtocolGuid,\r
- (VOID **) &FvProtocol,\r
+ (VOID **)&FvProtocol,\r
gImageHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
Instance = AllocateZeroPool (sizeof (FV_FILESYSTEM_INSTANCE));\r
ASSERT (Instance != NULL);\r
\r
- Instance->Root = NULL;\r
+ Instance->Root = NULL;\r
Instance->FvProtocol = FvProtocol;\r
- Instance->Signature = FVFS_INSTANCE_SIGNATURE;\r
+ Instance->Signature = FVFS_INSTANCE_SIGNATURE;\r
InitializeListHead (&Instance->FileInfoHead);\r
InitializeListHead (&Instance->FileHead);\r
CopyMem (&Instance->SimpleFs, &mSimpleFsTemplate, sizeof (mSimpleFsTemplate));\r
\r
- Status = gBS->InstallProtocolInterface(\r
+ Status = gBS->InstallProtocolInterface (\r
&ControllerHandle,\r
&gEfiSimpleFileSystemProtocolGuid,\r
EFI_NATIVE_INTERFACE,\r
// Get the device path to find the FV's GUID\r
//\r
Instance->VolumeLabel = NULL;\r
- Status = gBS->OpenProtocol (\r
- ControllerHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- (VOID **) &FvDevicePath,\r
- gImageHandle,\r
- ControllerHandle,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
+ Status = gBS->OpenProtocol (\r
+ ControllerHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ (VOID **)&FvDevicePath,\r
+ gImageHandle,\r
+ ControllerHandle,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
if (!EFI_ERROR (Status)) {\r
//\r
// Iterate over device path until we find a firmware volume node\r
//\r
while (!IsDevicePathEndType (FvDevicePath)) {\r
- if (DevicePathType (FvDevicePath) == MEDIA_DEVICE_PATH &&\r
- DevicePathSubType (FvDevicePath) == MEDIA_PIWG_FW_VOL_DP) {\r
+ if ((DevicePathType (FvDevicePath) == MEDIA_DEVICE_PATH) &&\r
+ (DevicePathSubType (FvDevicePath) == MEDIA_PIWG_FW_VOL_DP))\r
+ {\r
//\r
// Allocate the volume label\r
//\r
//\r
// Extract the FV's guid\r
//\r
- FvGuid = &((MEDIA_FW_VOL_DEVICE_PATH *) FvDevicePath)->FvName;\r
+ FvGuid = &((MEDIA_FW_VOL_DEVICE_PATH *)FvDevicePath)->FvName;\r
//\r
// Build the volume label string\r
//\r
);\r
ASSERT ((NumChars + 1) * sizeof (CHAR16) == FVFS_VOLUME_LABEL_SIZE);\r
}\r
+\r
break;\r
}\r
+\r
FvDevicePath = NextDevicePathNode (FvDevicePath);\r
}\r
}\r
+\r
//\r
// If we didn't decide on a volume label, set a fallback one\r
//\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemDriverStop (\r
- IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN UINTN NumberOfChildren,\r
- IN EFI_HANDLE *ChildHandleBuffer OPTIONAL\r
+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN UINTN NumberOfChildren,\r
+ IN EFI_HANDLE *ChildHandleBuffer OPTIONAL\r
)\r
{\r
EFI_STATUS Status;\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiSimpleFileSystemProtocolGuid,\r
- (VOID **) &SimpleFile,\r
+ (VOID **)&SimpleFile,\r
DriverBinding->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
// Close and uninstall protocols.\r
//\r
Status = gBS->CloseProtocol (\r
- ControllerHandle,\r
- &gEfiFirmwareVolume2ProtocolGuid,\r
- gImageHandle,\r
- ControllerHandle\r
- );\r
+ ControllerHandle,\r
+ &gEfiFirmwareVolume2ProtocolGuid,\r
+ gImageHandle,\r
+ ControllerHandle\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->UninstallProtocolInterface (\r
//\r
// Free the Subtask list.\r
//\r
- for(Entry = Instance->FileInfoHead.ForwardLink;\r
- Entry != (&Instance->FileInfoHead);\r
- ) {\r
+ for (Entry = Instance->FileInfoHead.ForwardLink;\r
+ Entry != (&Instance->FileInfoHead);\r
+ )\r
+ {\r
DelEntry = Entry;\r
Entry = Entry->ForwardLink;\r
FvFileInfo = FVFS_FILE_INFO_FROM_LINK (DelEntry);\r
if (Instance->Root->FvFileInfo != NULL) {\r
FreePool (Instance->Root->FvFileInfo);\r
}\r
+\r
FreePool (Instance->Root);\r
}\r
\r
if (Instance->VolumeLabel != NULL) {\r
FreePool (Instance->VolumeLabel);\r
}\r
+\r
FreePool (Instance);\r
\r
return EFI_SUCCESS;\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemEntryPoint (\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
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
//\r
// Install driver model protocol(s).\r