/** @file\r
BDS Lib functions which relate with create or process the boot option.\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. <BR>\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
BdsRefreshBbsTableForBoot (Option);\r
\r
//\r
- // Write boot to OS performance data to a file\r
+ // Write boot to OS performance data for legacy boot.\r
//\r
PERF_CODE (\r
WriteBootToOsPerformanceData ();\r
\r
@retval TRUE This boot option matches a valid EFI NV Boot####.\r
@retval FALSE If not.\r
- \r
+\r
**/\r
BOOLEAN\r
IsBootOptionValidNVVarialbe (\r
}\r
\r
//\r
- // If the Boot Option Number and Device Path matches, OptionToCheck matches a \r
+ // If the Boot Option Number and Device Path matches, OptionToCheck matches a\r
// valid EFI NV Boot####.\r
//\r
if ((OptionToCheck->BootCurrent == BootOption->BootCurrent) &&\r
}\r
\r
FreePool (BootOption);\r
- \r
+\r
return Valid;\r
}\r
/**\r
EFI_DEVICE_PATH_PROTOCOL *WorkingDevicePath;\r
EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save;\r
LIST_ENTRY TempBootLists;\r
- EFI_SECURITY_ARCH_PROTOCOL *SecurityProtocol;\r
\r
//\r
// Record the performance data for End of BDS\r
//\r
- PERF_END (0, "BDS", NULL, 0);\r
+ PERF_END(NULL, "BDS", NULL, 0);\r
\r
*ExitDataSize = 0;\r
*ExitData = NULL;\r
// Signal the EVT_SIGNAL_READY_TO_BOOT event\r
//\r
EfiSignalEventReadyToBoot();\r
- \r
- \r
+\r
+\r
//\r
// Set Boot Current\r
//\r
//\r
InitializeListHead (&TempBootLists);\r
BdsLibRegisterNewOption (&TempBootLists, DevicePath, L"EFI Internal Shell", L"BootOrder");\r
- \r
+\r
//\r
// free the temporary device path created by BdsLibUpdateFvFileDevicePath()\r
//\r
- FreePool (DevicePath); \r
+ FreePool (DevicePath);\r
DevicePath = Option->DevicePath;\r
}\r
\r
- //\r
- // Measure GPT Table by SAP protocol.\r
- //\r
- Status = gBS->LocateProtocol (\r
- &gEfiSecurityArchProtocolGuid,\r
- NULL,\r
- (VOID**) &SecurityProtocol\r
- );\r
- if (!EFI_ERROR (Status)) {\r
- Status = SecurityProtocol->FileAuthenticationState (SecurityProtocol, 0, DevicePath);\r
- }\r
-\r
- DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Booting %S\n", Option->Description));\r
+ DEBUG_CODE_BEGIN();\r
+ UINTN DevicePathTypeValue;\r
+ CHAR16 *HiiString;\r
+ CHAR16 *BootStringNumber;\r
+ UINTN BufferSize;\r
+ \r
+ DevicePathTypeValue = BdsGetBootTypeFromDevicePath (Option->DevicePath);\r
+ \r
+ //\r
+ // store number string of boot option temporary.\r
+ //\r
+ HiiString = NULL;\r
+ switch (DevicePathTypeValue) {\r
+ case BDS_EFI_ACPI_FLOPPY_BOOT:\r
+ HiiString = L"EFI Floppy";\r
+ break;\r
+ case BDS_EFI_MEDIA_CDROM_BOOT:\r
+ case BDS_EFI_MESSAGE_SATA_BOOT:\r
+ case BDS_EFI_MESSAGE_ATAPI_BOOT:\r
+ HiiString = L"EFI DVD/CDROM";\r
+ break;\r
+ case BDS_EFI_MESSAGE_USB_DEVICE_BOOT:\r
+ HiiString = L"EFI USB Device";\r
+ break;\r
+ case BDS_EFI_MESSAGE_SCSI_BOOT:\r
+ HiiString = L"EFI SCSI Device";\r
+ break;\r
+ case BDS_EFI_MESSAGE_MISC_BOOT:\r
+ HiiString = L"EFI Misc Device";\r
+ break;\r
+ case BDS_EFI_MESSAGE_MAC_BOOT:\r
+ HiiString = L"EFI Network";\r
+ break;\r
+ case BBS_DEVICE_PATH:\r
+ //\r
+ // Do nothing for legacy boot option.\r
+ //\r
+ break;\r
+ default:\r
+ DEBUG((EFI_D_INFO, "Can not find HiiString for given device path type 0x%x\n", DevicePathTypeValue));\r
+ }\r
\r
+ //\r
+ // If found Hii description string then cat Hii string with original description.\r
+ //\r
+ if (HiiString != NULL) {\r
+ BootStringNumber = Option->Description;\r
+ BufferSize = StrSize(BootStringNumber);\r
+ BufferSize += StrSize(HiiString);\r
+ Option->Description = AllocateZeroPool(BufferSize);\r
+ ASSERT (Option->Description != NULL);\r
+ StrCpy (Option->Description, HiiString);\r
+ if (StrnCmp (BootStringNumber, L"0", 1) != 0) {\r
+ StrCat (Option->Description, L" ");\r
+ StrCat (Option->Description, BootStringNumber);\r
+ } \r
+ \r
+ FreePool (BootStringNumber);\r
+ }\r
+ \r
+ DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Booting %S\n", Option->Description));\r
+ \r
+ DEBUG_CODE_END();\r
+ \r
Status = gBS->LoadImage (\r
TRUE,\r
mBdsImageHandle,\r
);\r
\r
//\r
- // If we didn't find an image directly, we need to try as if it is a removable device boot opotion\r
+ // If we didn't find an image directly, we need to try as if it is a removable device boot option\r
// and load the image according to the default boot behavior for removable device.\r
//\r
if (EFI_ERROR (Status)) {\r
//\r
gBS->SetWatchdogTimer (5 * 60, 0x0000, 0x00, NULL);\r
\r
+ //\r
+ // Write boot to OS performance data for UEFI boot\r
+ //\r
+ PERF_CODE (\r
+ WriteBootToOsPerformanceData ();\r
+ );\r
+\r
Status = gBS->StartImage (ImageHandle, ExitDataSize, ExitData);\r
DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));\r
\r
&mHdBootVariablePrivateGuid,\r
&CachedDevicePathSize\r
);\r
- \r
+\r
if (CachedDevicePath != NULL) {\r
TempNewDevicePath = CachedDevicePath;\r
DeviceExist = FALSE;\r
TempNewDevicePath = CachedDevicePath;\r
CachedDevicePath = BdsLibDelPartMatchInstance (CachedDevicePath, Instance );\r
FreePool (TempNewDevicePath);\r
- \r
+\r
//\r
// Second, append the remaining path after the matched instance\r
//\r
CachedDevicePath\r
);\r
}\r
- \r
+\r
FreePool (Instance);\r
FreePool (CachedDevicePath);\r
return FullDevicePath;\r
break;\r
}\r
}\r
- \r
+\r
FreePool (CachedDevicePath);\r
if (BlockIoBuffer != NULL) {\r
FreePool (BlockIoBuffer);\r
if ((BlockIoDevicePath == NULL) || (HardDriveDevicePath == NULL)) {\r
return FALSE;\r
}\r
- \r
+\r
//\r
// Make PreviousDevicePath == the device path node before the end node\r
//\r
//\r
TmpHdPath = (HARDDRIVE_DEVICE_PATH *) BlockIoHdDevicePathNode;\r
Match = FALSE;\r
- \r
+\r
//\r
// Check for the match\r
//\r
&gEfiGlobalVariableGuid,\r
&BootOptionSize\r
);\r
- \r
+\r
if (BootOptionVar == NULL) {\r
FreePool (BootOrder);\r
return EFI_OUT_OF_RESOURCES;\r
\r
/**\r
For EFI boot option, BDS separate them as six types:\r
- 1. Network - The boot option points to the SimpleNetworkProtocol device. \r
+ 1. Network - The boot option points to the SimpleNetworkProtocol device.\r
Bds will try to automatically create this type boot option when enumerate.\r
- 2. Shell - The boot option points to internal flash shell. \r
+ 2. Shell - The boot option points to internal flash shell.\r
Bds will try to automatically create this type boot option when enumerate.\r
3. Removable BlockIo - The boot option only points to the removable media\r
device, like USB flash disk, DVD, Floppy etc.\r
These device should contain a *removable* blockIo\r
protocol in their device handle.\r
- Bds will try to automatically create this type boot option \r
+ Bds will try to automatically create this type boot option\r
when enumerate.\r
- 4. Fixed BlockIo - The boot option only points to a Fixed blockIo device, \r
+ 4. Fixed BlockIo - The boot option only points to a Fixed blockIo device,\r
like HardDisk.\r
These device should contain a *fixed* blockIo\r
protocol in their device handle.\r
BDS will skip fixed blockIo devices, and NOT\r
- automatically create boot option for them. But BDS \r
- will help to delete those fixed blockIo boot option, \r
+ automatically create boot option for them. But BDS\r
+ will help to delete those fixed blockIo boot option,\r
whose description rule conflict with other auto-created\r
boot options.\r
- 5. Non-BlockIo Simplefile - The boot option points to a device whose handle \r
+ 5. Non-BlockIo Simplefile - The boot option points to a device whose handle\r
has SimpleFileSystem Protocol, but has no blockio\r
protocol. These devices do not offer blockIo\r
- protocol, but BDS still can get the \r
+ protocol, but BDS still can get the\r
\EFI\BOOT\boot{machinename}.EFI by SimpleFileSystem\r
Protocol.\r
- 6. File - The boot option points to a file. These boot options are usually \r
+ 6. File - The boot option points to a file. These boot options are usually\r
created by user manually or OS loader. BDS will not delete or modify\r
- these boot options. \r
- \r
+ these boot options.\r
+\r
This function will enumerate all possible boot device in the system, and\r
- automatically create boot options for Network, Shell, Removable BlockIo, \r
+ automatically create boot options for Network, Shell, Removable BlockIo,\r
and Non-BlockIo Simplefile devices.\r
It will only execute once of every boot.\r
- \r
+\r
@param BdsBootOptionList The header of the link list which indexed all\r
current boot options\r
\r
EFI_HANDLE *BlockIoHandles;\r
EFI_BLOCK_IO_PROTOCOL *BlkIo;\r
UINTN Index;\r
- UINTN NumberSimpleNetworkHandles;\r
- EFI_HANDLE *SimpleNetworkHandles;\r
+ UINTN NumberNetworkHandles;\r
+ EFI_HANDLE *NetworkHandles;\r
UINTN FvHandleCount;\r
EFI_HANDLE *FvHandleBuffer;\r
EFI_FV_FILETYPE Type;\r
MiscNumber = 0;\r
ScsiNumber = 0;\r
ZeroMem (Buffer, sizeof (Buffer));\r
- \r
+\r
//\r
// If the boot device enumerate happened, just get the boot\r
// device from the boot order variable\r
Status = BdsLibBuildOptionFromVar (BdsBootOptionList, L"BootOrder");\r
return Status;\r
}\r
- \r
+\r
//\r
// Notes: this dirty code is to get the legacy boot option from the\r
// BBS table and create to variable as the EFI boot option, it should\r
// Delete invalid boot option\r
//\r
BdsDeleteAllInvalidEfiBootOption ();\r
- \r
+\r
//\r
// Parse removable media\r
//\r
&NumberBlockIoHandles,\r
&BlockIoHandles\r
);\r
- \r
+\r
for (Index = 0; Index < NumberBlockIoHandles; Index++) {\r
Status = gBS->HandleProtocol (\r
BlockIoHandles[Index],\r
\r
switch (DevicePathType) {\r
case BDS_EFI_ACPI_FLOPPY_BOOT:\r
- UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", FloppyNumber); \r
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", FloppyNumber);\r
BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
FloppyNumber++;\r
break;\r
- \r
+\r
//\r
// Assume a removable SATA device should be the DVD/CD device\r
//\r
\r
case BDS_EFI_MESSAGE_SCSI_BOOT:\r
UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", ScsiNumber);\r
- BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer); \r
+ BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
ScsiNumber++;\r
break;\r
\r
case BDS_EFI_MESSAGE_MISC_BOOT:\r
UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", MiscNumber);\r
- BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer); \r
+ BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
MiscNumber++;\r
break;\r
\r
//\r
// Parse Network Boot Device\r
//\r
+ NumberNetworkHandles = 0;\r
+ //\r
+ // Search MNP Service Binding protocol for UEFI network stack\r
+ //\r
gBS->LocateHandleBuffer (\r
ByProtocol,\r
- &gEfiSimpleNetworkProtocolGuid,\r
+ &gEfiManagedNetworkServiceBindingProtocolGuid,\r
NULL,\r
- &NumberSimpleNetworkHandles,\r
- &SimpleNetworkHandles\r
+ &NumberNetworkHandles,\r
+ &NetworkHandles\r
);\r
+ if (NumberNetworkHandles == 0) {\r
+ //\r
+ // MNP Service Binding protocol not found, search SNP for EFI network stack\r
+ //\r
+ gBS->LocateHandleBuffer (\r
+ ByProtocol,\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ NULL,\r
+ &NumberNetworkHandles,\r
+ &NetworkHandles\r
+ );\r
+ }\r
\r
- for (Index = 0; Index < NumberSimpleNetworkHandles; Index++) {\r
+ for (Index = 0; Index < NumberNetworkHandles; Index++) {\r
UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", Index);\r
- BdsLibBuildOptionFromHandle (SimpleNetworkHandles[Index], BdsBootOptionList, Buffer);\r
+ BdsLibBuildOptionFromHandle (NetworkHandles[Index], BdsBootOptionList, Buffer);\r
}\r
\r
- if (NumberSimpleNetworkHandles != 0) {\r
- FreePool (SimpleNetworkHandles);\r
+ if (NumberNetworkHandles != 0) {\r
+ FreePool (NetworkHandles);\r
}\r
\r
//\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- \r
+\r
DevicePath = DevicePathFromHandle (Handle);\r
\r
//\r
EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
\r
UpdatedDevicePath = DevicePath;\r
- \r
+\r
//\r
// Check whether the device is connected\r
//\r
//\r
DupDevicePath = DuplicateDevicePath (DevicePath);\r
ASSERT (DupDevicePath != NULL);\r
- \r
+\r
UpdatedDevicePath = DupDevicePath;\r
Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);\r
//\r
MediaPresent = FALSE;\r
\r
UpdatedDevicePath = DevicePath;\r
- Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ //\r
+ // Locate MNP Service Binding protocol for UEFI network stack first\r
+ //\r
+ Status = gBS->LocateDevicePath (&gEfiManagedNetworkServiceBindingProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // MNP Service Binding protocol not found, search SNP for EFI network stack\r
+ //\r
+ UpdatedDevicePath = DevicePath;\r
+ Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ }\r
if (EFI_ERROR (Status)) {\r
//\r
// Device not present so see if we need to connect it\r
//\r
// This one should work after we did the connect\r
//\r
- Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ Status = gBS->LocateDevicePath (&gEfiManagedNetworkServiceBindingProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ if (EFI_ERROR (Status)) {\r
+ UpdatedDevicePath = DevicePath;\r
+ Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ }\r
}\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
Status = gBS->HandleProtocol (Handle, &gEfiSimpleNetworkProtocolGuid, (VOID **)&Snp);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Failed to open SNP from this handle, try to get SNP from parent handle\r
+ //\r
+ UpdatedDevicePath = DevicePathFromHandle (Handle);\r
+ if (UpdatedDevicePath != NULL) {\r
+ Status = gBS->LocateDevicePath (&gEfiSimpleNetworkProtocolGuid, &UpdatedDevicePath, &Handle);\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // SNP handle found, get SNP from it\r
+ //\r
+ Status = gBS->HandleProtocol (Handle, &gEfiSimpleNetworkProtocolGuid, (VOID **) &Snp);\r
+ }\r
+ }\r
+ }\r
+\r
if (!EFI_ERROR (Status)) {\r
if (Snp->Mode->MediaPresentSupported) {\r
if (Snp->Mode->State == EfiSimpleNetworkInitialized) {\r
\r
@param DevicePath The bootable device Path to check\r
\r
- @retval BDS_EFI_MEDIA_HD_BOOT If given device path contains MEDIA_DEVICE_PATH type device path node \r
+ @retval BDS_EFI_MEDIA_HD_BOOT If given device path contains MEDIA_DEVICE_PATH type device path node\r
which subtype is MEDIA_HARDDRIVE_DP\r
@retval BDS_EFI_MEDIA_CDROM_BOOT If given device path contains MEDIA_DEVICE_PATH type device path node\r
which subtype is MEDIA_CDROM_DP\r
@retval BDS_EFI_MESSAGE_MISC_BOOT If the device path not contains any media device path node, and\r
its last device path node point to a message device path node.\r
@retval BDS_LEGACY_BBS_BOOT If given device path contains BBS_DEVICE_PATH type device path node.\r
- @retval BDS_EFI_UNSUPPORT An EFI Removable BlockIO device path not point to a media and message device, \r
+ @retval BDS_EFI_UNSUPPORT An EFI Removable BlockIO device path not point to a media and message device,\r
\r
**/\r
UINT32\r
ACPI_HID_DEVICE_PATH *Acpi;\r
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *LastDeviceNode;\r
-\r
+ UINT32 BootType;\r
\r
if (NULL == DevicePath) {\r
return BDS_EFI_UNSUPPORT;\r
return BDS_EFI_MEDIA_HD_BOOT;\r
} else if (DevicePathSubType (TempDevicePath) == MEDIA_CDROM_DP) {\r
return BDS_EFI_MEDIA_CDROM_BOOT;\r
- } \r
+ }\r
break;\r
case ACPI_DEVICE_PATH:\r
Acpi = (ACPI_HID_DEVICE_PATH *) TempDevicePath;\r
if (DevicePathSubType(LastDeviceNode) == MSG_DEVICE_LOGICAL_UNIT_DP) {\r
//\r
// if the next node type is Device Logical Unit, which specify the Logical Unit Number (LUN),\r
- // skit it\r
+ // skip it\r
//\r
LastDeviceNode = NextDevicePathNode (LastDeviceNode);\r
}\r
// if the device path not only point to driver device, it is not a messaging device path,\r
//\r
if (!IsDevicePathEndType (LastDeviceNode)) {\r
- break; \r
+ break;\r
}\r
\r
- if (DevicePathSubType(TempDevicePath) == MSG_ATAPI_DP) {\r
- return BDS_EFI_MESSAGE_ATAPI_BOOT;\r
- } else if (DevicePathSubType(TempDevicePath) == MSG_USB_DP) {\r
- return BDS_EFI_MESSAGE_USB_DEVICE_BOOT;\r
- } else if (DevicePathSubType(TempDevicePath) == MSG_SCSI_DP) {\r
- return BDS_EFI_MESSAGE_SCSI_BOOT;\r
- } else if (DevicePathSubType(TempDevicePath) == MSG_SATA_DP) {\r
- return BDS_EFI_MESSAGE_SATA_BOOT;\r
- } else if (DevicePathSubType(TempDevicePath) == MSG_MAC_ADDR_DP) {\r
- return BDS_EFI_MESSAGE_MAC_BOOT;\r
+ switch (DevicePathSubType (TempDevicePath)) {\r
+ case MSG_ATAPI_DP:\r
+ BootType = BDS_EFI_MESSAGE_ATAPI_BOOT;\r
+ break;\r
+\r
+ case MSG_USB_DP:\r
+ BootType = BDS_EFI_MESSAGE_USB_DEVICE_BOOT;\r
+ break;\r
+\r
+ case MSG_SCSI_DP:\r
+ BootType = BDS_EFI_MESSAGE_SCSI_BOOT;\r
+ break;\r
+\r
+ case MSG_SATA_DP:\r
+ BootType = BDS_EFI_MESSAGE_SATA_BOOT;\r
+ break;\r
+\r
+ case MSG_MAC_ADDR_DP:\r
+ case MSG_VLAN_DP:\r
+ BootType = BDS_EFI_MESSAGE_MAC_BOOT;\r
+ break;\r
+\r
+ default:\r
+ BootType = BDS_EFI_MESSAGE_MISC_BOOT;\r
+ break;\r
}\r
- return BDS_EFI_MESSAGE_MISC_BOOT;\r
+ return BootType;\r
+\r
default:\r
break;\r
}\r
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *LastDeviceNode;\r
EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ EFI_LOAD_FILE_PROTOCOL *LoadFile;\r
\r
TempDevicePath = DevPath;\r
LastDeviceNode = DevPath;\r
- \r
+\r
//\r
// Check if it's a valid boot option for network boot device\r
- // Only check if there is SimpleNetworkProtocol installed. If yes, that means\r
- // there is the network card there.\r
+ // Check if there is MNP Service Binding Protocol or SimpleNetworkProtocol\r
+ // installed. If yes, that means there is the network card there.\r
//\r
Status = gBS->LocateDevicePath (\r
- &gEfiSimpleNetworkProtocolGuid,\r
+ &gEfiManagedNetworkServiceBindingProtocolGuid,\r
&TempDevicePath,\r
&Handle\r
);\r
+ if (EFI_ERROR (Status)) {\r
+ TempDevicePath = DevPath;\r
+ Status = gBS->LocateDevicePath (\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ &TempDevicePath,\r
+ &Handle\r
+ );\r
+ }\r
if (EFI_ERROR (Status)) {\r
//\r
// Device not present so see if we need to connect it\r
TempDevicePath = DevPath;\r
BdsLibConnectDevicePath (TempDevicePath);\r
Status = gBS->LocateDevicePath (\r
- &gEfiSimpleNetworkProtocolGuid,\r
+ &gEfiManagedNetworkServiceBindingProtocolGuid,\r
&TempDevicePath,\r
&Handle\r
);\r
+ if (EFI_ERROR (Status)) {\r
+ TempDevicePath = DevPath;\r
+ Status = gBS->LocateDevicePath (\r
+ &gEfiSimpleNetworkProtocolGuid,\r
+ &TempDevicePath,\r
+ &Handle\r
+ );\r
+ }\r
}\r
- \r
+\r
if (!EFI_ERROR (Status)) {\r
- if (CheckMedia) {\r
- //\r
- // Test if it is ready to boot now\r
- //\r
- if (BdsLibNetworkBootWithMediaPresent(DevPath)) {\r
+ //\r
+ // Check whether LoadFile protocol is installed\r
+ //\r
+ Status = gBS->HandleProtocol (Handle, &gEfiLoadFileProtocolGuid, (VOID **)&LoadFile);\r
+ if (!EFI_ERROR (Status)) {\r
+ if (!IsDevicePathEnd (TempDevicePath)) {\r
+ //\r
+ // LoadFile protocol is not installed on handle with exactly the same DevPath\r
+ //\r
+ return FALSE;\r
+ }\r
+\r
+ if (CheckMedia) {\r
+ //\r
+ // Test if it is ready to boot now\r
+ //\r
+ if (BdsLibNetworkBootWithMediaPresent(DevPath)) {\r
+ return TRUE;\r
+ }\r
+ } else {\r
return TRUE;\r
}\r
- } else {\r
- return TRUE;\r
}\r
}\r
\r
//\r
// If the boot option point to Internal FV shell, make sure it is valid\r
//\r
- TempDevicePath = DevPath; \r
+ TempDevicePath = DevPath;\r
Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));\r
if (Status == EFI_ALREADY_STARTED) {\r
return TRUE;\r
} else {\r
if (Status == EFI_SUCCESS) {\r
- FreePool (TempDevicePath); \r
+ FreePool (TempDevicePath);\r
}\r
return FALSE;\r
}\r
}\r
- \r
+\r
//\r
// If the boot option point to a blockIO device:\r
// if it is a removable blockIo device, it is valid.\r
- // if it is a fixed blockIo device, check its description confliction. \r
+ // if it is a fixed blockIo device, check its description confliction.\r
//\r
TempDevicePath = DevPath;\r
Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r
Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r
}\r
}\r
- \r
+\r
if (!EFI_ERROR (Status)) {\r
Status = gBS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
if (!EFI_ERROR (Status)) {\r
if (FileGuid == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
//\r
// Check whether the device path point to the default the input Fv file\r
//\r
}\r
\r
if (FvHandleBuffer != NULL) {\r
- FreePool (FvHandleBuffer); \r
+ FreePool (FvHandleBuffer);\r
}\r
}\r
\r
projects / mirror_edk2.git / blobdiff