Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the BDS to show UEFI hard drive boot option as "EFI Hard Drive" instead of "EFI DVD/CDROM" 

Signed-off-by: niruiyu
Reviewed-by: li-elvin

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11974 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu 2011-07-05 07:55:45 +00:00
parent 5d0066d872
commit 889a4bc2a9
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
View File

@ -1435,6 +1435,7 @@ BdsLibEnumerateAllBootOption (
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINT16 FloppyNumber; UINT16 FloppyNumber;
UINT16 HarddriveNumber;
UINT16 CdromNumber; UINT16 CdromNumber;
UINT16 UsbNumber; UINT16 UsbNumber;
UINT16 MiscNumber; UINT16 MiscNumber;
@ -1467,13 +1468,14 @@ BdsLibEnumerateAllBootOption (
EFI_IMAGE_OPTIONAL_HEADER_UNION HdrData; EFI_IMAGE_OPTIONAL_HEADER_UNION HdrData;
EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr; EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;
FloppyNumber = 0; FloppyNumber = 0;
CdromNumber = 0; HarddriveNumber = 0;
UsbNumber = 0; CdromNumber = 0;
MiscNumber = 0; UsbNumber = 0;
ScsiNumber = 0; MiscNumber = 0;
PlatLang = NULL; ScsiNumber = 0;
LastLang = NULL; PlatLang = NULL;
LastLang = NULL;
ZeroMem (Buffer, sizeof (Buffer)); ZeroMem (Buffer, sizeof (Buffer));
// //
@ -1562,18 +1564,27 @@ BdsLibEnumerateAllBootOption (
break; break;
// //
// Assume a removable SATA device should be the DVD/CD device // Assume a removable SATA device should be the DVD/CD device, a fixed SATA device should be the Hard Drive device.
// //
case BDS_EFI_MESSAGE_ATAPI_BOOT: case BDS_EFI_MESSAGE_ATAPI_BOOT:
case BDS_EFI_MESSAGE_SATA_BOOT: case BDS_EFI_MESSAGE_SATA_BOOT:
if (CdromNumber != 0) { if (BlkIo->Media->RemovableMedia) {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)), CdromNumber); if (CdromNumber != 0) {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)), CdromNumber);
} else {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)));
}
CdromNumber++;
} else { } else {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD))); if (HarddriveNumber != 0) {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_HARDDRIVE)), HarddriveNumber);
} else {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_HARDDRIVE)));
}
HarddriveNumber++;
} }
DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Buffer: %S\n", Buffer)); DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Buffer: %S\n", Buffer));
BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer); BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);
CdromNumber++;
break; break;
case BDS_EFI_MESSAGE_USB_DEVICE_BOOT: case BDS_EFI_MESSAGE_USB_DEVICE_BOOT:

BIN
IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsStrings.uni
View File

Binary file not shown.