From 889ac6a8b7d632c7c2dc203bd20b722b9ee57719 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 29 Jul 2014 14:15:15 +0000 Subject: ArmPlatformPkg/Bds: Got rid of RequestBootType argument Removed "RequestBootType" argument of the "*CreateDevicePathNode()" and "*UpdateDevicePathNode()" functions. A boolean field "Request BootType" has been added to the BDS_LOAD_OPTION_SUPPORT structure and is used by the "BootMenuAddBootOption()" and "BootMenuUpdateBootOption()" functions instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ronald Cron Reviewed-By: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15713 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/Bds/BootOptionSupport.c | 63 +++++++++++++--------------------- 1 file changed, 24 insertions(+), 39 deletions(-) (limited to 'ArmPlatformPkg/Bds/BootOptionSupport.c') diff --git a/ArmPlatformPkg/Bds/BootOptionSupport.c b/ArmPlatformPkg/Bds/BootOptionSupport.c index 8708d306f3..42ddba34a5 100644 --- a/ArmPlatformPkg/Bds/BootOptionSupport.c +++ b/ArmPlatformPkg/Bds/BootOptionSupport.c @@ -34,16 +34,14 @@ BdsLoadOptionFileSystemList ( EFI_STATUS BdsLoadOptionFileSystemCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ); EFI_STATUS BdsLoadOptionFileSystemUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ); BOOLEAN @@ -59,16 +57,14 @@ BdsLoadOptionMemMapList ( EFI_STATUS BdsLoadOptionMemMapCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ); EFI_STATUS BdsLoadOptionMemMapUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ); BOOLEAN @@ -84,16 +80,14 @@ BdsLoadOptionPxeList ( EFI_STATUS BdsLoadOptionPxeCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ); EFI_STATUS BdsLoadOptionPxeUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ); BOOLEAN @@ -109,16 +103,14 @@ BdsLoadOptionTftpList ( EFI_STATUS BdsLoadOptionTftpCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ); EFI_STATUS BdsLoadOptionTftpUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ); BOOLEAN @@ -132,28 +124,32 @@ BDS_LOAD_OPTION_SUPPORT BdsLoadOptionSupportList[] = { BdsLoadOptionFileSystemList, BdsLoadOptionFileSystemIsSupported, BdsLoadOptionFileSystemCreateDevicePath, - BdsLoadOptionFileSystemUpdateDevicePath + BdsLoadOptionFileSystemUpdateDevicePath, + TRUE }, { BDS_DEVICE_MEMMAP, BdsLoadOptionMemMapList, BdsLoadOptionMemMapIsSupported, BdsLoadOptionMemMapCreateDevicePath, - BdsLoadOptionMemMapUpdateDevicePath + BdsLoadOptionMemMapUpdateDevicePath, + TRUE }, { BDS_DEVICE_PXE, BdsLoadOptionPxeList, BdsLoadOptionPxeIsSupported, BdsLoadOptionPxeCreateDevicePath, - BdsLoadOptionPxeUpdateDevicePath + BdsLoadOptionPxeUpdateDevicePath, + FALSE }, { BDS_DEVICE_TFTP, BdsLoadOptionTftpList, BdsLoadOptionTftpIsSupported, BdsLoadOptionTftpCreateDevicePath, - BdsLoadOptionTftpUpdateDevicePath + BdsLoadOptionTftpUpdateDevicePath, + TRUE } }; @@ -384,8 +380,7 @@ BdsLoadOptionFileSystemList ( EFI_STATUS BdsLoadOptionFileSystemCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ) { EFI_STATUS Status; @@ -421,8 +416,7 @@ EFI_STATUS BdsLoadOptionFileSystemUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ) { EFI_STATUS Status; @@ -571,8 +565,7 @@ BdsLoadOptionMemMapList ( EFI_STATUS BdsLoadOptionMemMapCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ) { EFI_STATUS Status; @@ -612,8 +605,7 @@ EFI_STATUS BdsLoadOptionMemMapUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ) { EFI_STATUS Status; @@ -714,16 +706,12 @@ BdsLoadOptionPxeList ( EFI_STATUS BdsLoadOptionPxeCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ) { *DevicePathNodes = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH); SetDevicePathEndNode (*DevicePathNodes); - if (RequestBootType) { - *RequestBootType = FALSE; - } return EFI_SUCCESS; } @@ -742,8 +730,7 @@ EFI_STATUS BdsLoadOptionPxeUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ) { // @@ -837,8 +824,7 @@ BdsLoadOptionTftpList ( EFI_STATUS BdsLoadOptionTftpCreateDevicePath ( IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathNodes ) { EFI_STATUS Status; @@ -913,8 +899,7 @@ EFI_STATUS BdsLoadOptionTftpUpdateDevicePath ( IN EFI_DEVICE_PATH *OldDevicePath, IN CHAR16* FileName, - OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath, - OUT BOOLEAN *RequestBootType + OUT EFI_DEVICE_PATH_PROTOCOL **NewDevicePath ) { ASSERT (0); -- cgit v1.2.3