} SINGLE_NODE_VENDOR_MEDIA_DEVPATH;\r
#pragma pack ()\r
\r
-STATIC EFI_HII_HANDLE mLinuxInitrdShellCommandHiiHandle;\r
-STATIC EFI_PHYSICAL_ADDRESS mInitrdFileAddress;\r
-STATIC UINTN mInitrdFileSize;\r
-STATIC EFI_HANDLE mInitrdLoadFile2Handle;\r
-\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-u", TypeFlag},\r
- {NULL, TypeMax}\r
- };\r
+STATIC EFI_HII_HANDLE mLinuxInitrdShellCommandHiiHandle;\r
+STATIC EFI_PHYSICAL_ADDRESS mInitrdFileAddress;\r
+STATIC UINTN mInitrdFileSize;\r
+STATIC EFI_HANDLE mInitrdLoadFile2Handle;\r
+\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-u", TypeFlag },\r
+ { NULL, TypeMax }\r
+};\r
\r
-STATIC CONST SINGLE_NODE_VENDOR_MEDIA_DEVPATH mInitrdDevicePath = {\r
+STATIC CONST SINGLE_NODE_VENDOR_MEDIA_DEVPATH mInitrdDevicePath = {\r
{\r
{\r
- MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH) }\r
+ MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,{ sizeof (VENDOR_DEVICE_PATH) }\r
},\r
LINUX_EFI_INITRD_MEDIA_GUID\r
- }, {\r
+ },{\r
END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
- { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
+ { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
}\r
};\r
\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- EFI_HANDLE Handle;\r
+ EFI_STATUS Status;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ EFI_HANDLE Handle;\r
\r
DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&mInitrdDevicePath;\r
- Status = gBS->LocateDevicePath (&gEfiLoadFile2ProtocolGuid, &DevicePath,\r
- &Handle);\r
+ Status = gBS->LocateDevicePath (\r
+ &gEfiLoadFile2ProtocolGuid,\r
+ &DevicePath,\r
+ &Handle\r
+ );\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
}\r
if (Handle == mInitrdLoadFile2Handle) {\r
return FALSE;\r
}\r
+\r
return TRUE;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
InitrdLoadFile2 (\r
- IN EFI_LOAD_FILE2_PROTOCOL *This,\r
- IN EFI_DEVICE_PATH_PROTOCOL *FilePath,\r
- IN BOOLEAN BootPolicy,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer OPTIONAL\r
+ IN EFI_LOAD_FILE2_PROTOCOL *This,\r
+ IN EFI_DEVICE_PATH_PROTOCOL *FilePath,\r
+ IN BOOLEAN BootPolicy,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer OPTIONAL\r
)\r
{\r
if (BootPolicy) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
- if (BufferSize == NULL || !IsDevicePathValid (FilePath, 0)) {\r
+ if ((BufferSize == NULL) || !IsDevicePathValid (FilePath, 0)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (FilePath->Type != END_DEVICE_PATH_TYPE ||\r
- FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE ||\r
- mInitrdFileSize == 0) {\r
+ if ((FilePath->Type != END_DEVICE_PATH_TYPE) ||\r
+ (FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE) ||\r
+ (mInitrdFileSize == 0))\r
+ {\r
return EFI_NOT_FOUND;\r
}\r
\r
- if (Buffer == NULL || *BufferSize < mInitrdFileSize) {\r
+ if ((Buffer == NULL) || (*BufferSize < mInitrdFileSize)) {\r
*BufferSize = mInitrdFileSize;\r
return EFI_BUFFER_TOO_SMALL;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-STATIC CONST EFI_LOAD_FILE2_PROTOCOL mInitrdLoadFile2 = {\r
+STATIC CONST EFI_LOAD_FILE2_PROTOCOL mInitrdLoadFile2 = {\r
InitrdLoadFile2,\r
};\r
\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
if (mInitrdLoadFile2Handle != NULL) {\r
- Status = gBS->UninstallMultipleProtocolInterfaces (mInitrdLoadFile2Handle,\r
- &gEfiDevicePathProtocolGuid, &mInitrdDevicePath,\r
- &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2,\r
- NULL);\r
+ Status = gBS->UninstallMultipleProtocolInterfaces (\r
+ mInitrdLoadFile2Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mInitrdDevicePath,\r
+ &gEfiLoadFile2ProtocolGuid,\r
+ &mInitrdLoadFile2,\r
+ NULL\r
+ );\r
if (!EFI_ERROR (Status)) {\r
mInitrdLoadFile2Handle = NULL;\r
}\r
+\r
return Status;\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
STATIC\r
EFI_STATUS\r
CacheInitrdFile (\r
- IN SHELL_FILE_HANDLE FileHandle\r
+ IN SHELL_FILE_HANDLE FileHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT64 FileSize;\r
- UINTN ReadSize;\r
+ EFI_STATUS Status;\r
+ UINT64 FileSize;\r
+ UINTN ReadSize;\r
\r
Status = gEfiShellProtocol->GetFileSize (FileHandle, &FileSize);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
- if (FileSize == 0 || FileSize > MAX_UINTN) {\r
+ if ((FileSize == 0) || (FileSize > MAX_UINTN)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
- Status = gBS->AllocatePages (AllocateAnyPages, EfiLoaderData,\r
- EFI_SIZE_TO_PAGES ((UINTN)FileSize), &mInitrdFileAddress);\r
+ Status = gBS->AllocatePages (\r
+ AllocateAnyPages,\r
+ EfiLoaderData,\r
+ EFI_SIZE_TO_PAGES ((UINTN)FileSize),\r
+ &mInitrdFileAddress\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
ReadSize = (UINTN)FileSize;\r
- Status = gEfiShellProtocol->ReadFile (FileHandle, &ReadSize,\r
- (VOID *)(UINTN)mInitrdFileAddress);\r
- if (EFI_ERROR (Status) || ReadSize < FileSize) {\r
- DEBUG ((DEBUG_WARN, "%a: failed to read initrd file - %r 0x%lx 0x%lx\n",\r
- __FUNCTION__, Status, (UINT64)ReadSize, FileSize));\r
+ Status = gEfiShellProtocol->ReadFile (\r
+ FileHandle,\r
+ &ReadSize,\r
+ (VOID *)(UINTN)mInitrdFileAddress\r
+ );\r
+ if (EFI_ERROR (Status) || (ReadSize < FileSize)) {\r
+ DEBUG ((\r
+ DEBUG_WARN,\r
+ "%a: failed to read initrd file - %r 0x%lx 0x%lx\n",\r
+ __FUNCTION__,\r
+ Status,\r
+ (UINT64)ReadSize,\r
+ FileSize\r
+ ));\r
goto FreeMemory;\r
}\r
\r
if (mInitrdLoadFile2Handle == NULL) {\r
- Status = gBS->InstallMultipleProtocolInterfaces (&mInitrdLoadFile2Handle,\r
- &gEfiDevicePathProtocolGuid, &mInitrdDevicePath,\r
- &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2,\r
- NULL);\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &mInitrdLoadFile2Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mInitrdDevicePath,\r
+ &gEfiLoadFile2ProtocolGuid,\r
+ &mInitrdLoadFile2,\r
+ NULL\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
}\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- CONST CHAR16 *Param;\r
- CHAR16 *Filename;\r
- SHELL_STATUS ShellStatus;\r
- SHELL_FILE_HANDLE FileHandle;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ CONST CHAR16 *Param;\r
+ CHAR16 *Filename;\r
+ SHELL_STATUS ShellStatus;\r
+ SHELL_FILE_HANDLE FileHandle;\r
\r
- ProblemParam = NULL;\r
- ShellStatus = SHELL_SUCCESS;\r
+ ProblemParam = NULL;\r
+ ShellStatus = SHELL_SUCCESS;\r
\r
Status = ShellInitialize ();\r
ASSERT_EFI_ERROR (Status);\r
//\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
if (EFI_ERROR (Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd", ProblemParam);\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_PROBLEM),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd",\r
+ ProblemParam\r
+ );\r
FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else if (IsOtherInitrdDevicePathAlreadyInstalled ()) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ALREADY_INSTALLED),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_ALREADY_INSTALLED),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd"\r
+ );\r
ShellStatus = SHELL_UNSUPPORTED;\r
} else {\r
if (ShellCommandLineGetCount (Package) > 2) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_TOO_MANY),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd"\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else if (ShellCommandLineGetCount (Package) < 2) {\r
if (ShellCommandLineGetFlag (Package, L"-u")) {\r
FreeInitrdFile ();\r
UninstallLoadFile2Protocol ();\r
} else {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_TOO_FEW),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd"\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
} else {\r
\r
Filename = ShellFindFilePath (Param);\r
if (Filename == NULL) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd", Param);\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_FIND_FAIL),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd",\r
+ Param\r
+ );\r
ShellStatus = SHELL_NOT_FOUND;\r
} else {\r
- Status = ShellOpenFileByName (Filename, &FileHandle,\r
- EFI_FILE_MODE_READ, 0);\r
+ Status = ShellOpenFileByName (\r
+ Filename,\r
+ &FileHandle,\r
+ EFI_FILE_MODE_READ,\r
+ 0\r
+ );\r
if (!EFI_ERROR (Status)) {\r
FreeInitrdFile ();\r
Status = CacheInitrdFile (FileHandle);\r
ShellCloseFile (&FileHandle);\r
}\r
+\r
if (EFI_ERROR (Status)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
- mLinuxInitrdShellCommandHiiHandle, L"initrd", Param);\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ L"initrd",\r
+ Param\r
+ );\r
ShellStatus = SHELL_NOT_FOUND;\r
}\r
+\r
FreePool (Filename);\r
}\r
}\r
}\r
+\r
return ShellStatus;\r
}\r
\r
-\r
/**\r
This is the shell command handler function pointer callback type. This\r
function handles the command when it is invoked in the shell.\r
SHELL_STATUS\r
EFIAPI\r
LinuxInitrdCommandHandler (\r
- IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This,\r
- IN EFI_SYSTEM_TABLE *SystemTable,\r
- IN EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,\r
- IN EFI_SHELL_PROTOCOL *Shell\r
+ IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This,\r
+ IN EFI_SYSTEM_TABLE *SystemTable,\r
+ IN EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,\r
+ IN EFI_SHELL_PROTOCOL *Shell\r
)\r
{\r
gEfiShellParametersProtocol = ShellParameters;\r
CHAR16 *\r
EFIAPI\r
LinuxInitrdGetHelp (\r
- IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This,\r
- IN CONST CHAR8 *Language\r
+ IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This,\r
+ IN CONST CHAR8 *Language\r
)\r
{\r
- return HiiGetString (mLinuxInitrdShellCommandHiiHandle,\r
- STRING_TOKEN (STR_GET_HELP_INITRD), Language);\r
+ return HiiGetString (\r
+ mLinuxInitrdShellCommandHiiHandle,\r
+ STRING_TOKEN (STR_GET_HELP_INITRD),\r
+ Language\r
+ );\r
}\r
\r
-STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL mLinuxInitrdDynamicCommand = {\r
+STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL mLinuxInitrdDynamicCommand = {\r
L"initrd",\r
LinuxInitrdCommandHandler,\r
LinuxInitrdGetHelp\r
STATIC\r
EFI_HII_HANDLE\r
InitializeHiiPackage (\r
- EFI_HANDLE ImageHandle\r
+ EFI_HANDLE ImageHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
- EFI_HII_HANDLE HiiHandle;\r
+ EFI_STATUS Status;\r
+ EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
+ EFI_HII_HANDLE HiiHandle;\r
\r
//\r
// Retrieve HII package list from ImageHandle\r
//\r
- Status = gBS->OpenProtocol (ImageHandle, &gEfiHiiPackageListProtocolGuid,\r
- (VOID **)&PackageList, ImageHandle, NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+ Status = gBS->OpenProtocol (\r
+ ImageHandle,\r
+ &gEfiHiiPackageListProtocolGuid,\r
+ (VOID **)&PackageList,\r
+ ImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
//\r
// Publish HII package list to HII Database.\r
//\r
- Status = gHiiDatabase->NewPackageList (gHiiDatabase, PackageList, NULL,\r
- &HiiHandle);\r
+ Status = gHiiDatabase->NewPackageList (\r
+ gHiiDatabase,\r
+ PackageList,\r
+ NULL,\r
+ &HiiHandle\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
}\r
+\r
return HiiHandle;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
LinuxInitrdDynamicShellCommandEntryPoint (\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
mLinuxInitrdShellCommandHiiHandle = InitializeHiiPackage (ImageHandle);\r
if (mLinuxInitrdShellCommandHiiHandle == NULL) {\r
return EFI_ABORTED;\r
}\r
\r
- Status = gBS->InstallProtocolInterface (&ImageHandle,\r
+ Status = gBS->InstallProtocolInterface (\r
+ &ImageHandle,\r
&gEfiShellDynamicCommandProtocolGuid,\r
EFI_NATIVE_INTERFACE,\r
- &mLinuxInitrdDynamicCommand);\r
+ &mLinuxInitrdDynamicCommand\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
return Status;\r
}\r
EFI_STATUS\r
EFIAPI\r
LinuxInitrdDynamicShellCommandUnload (\r
- IN EFI_HANDLE ImageHandle\r
-)\r
+ IN EFI_HANDLE ImageHandle\r
+ )\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
FreeInitrdFile ();\r
\r
return Status;\r
}\r
\r
- Status = gBS->UninstallProtocolInterface (ImageHandle,\r
+ Status = gBS->UninstallProtocolInterface (\r
+ ImageHandle,\r
&gEfiShellDynamicCommandProtocolGuid,\r
- &mLinuxInitrdDynamicCommand);\r
+ &mLinuxInitrdDynamicCommand\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
projects / mirror_edk2.git / blobdiff