if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.4.5.4");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.4.5.5");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
UINTN ErrorInStep = 0;
EFI_DEVICE_PATH *DiscoveredPathList[MAX_DISCOVERED_PATHS];
- BeginExternalScreen(TRUE, L"Booting Legacy OS");
+ BeginExternalScreen(TRUE, L"Booting Legacy OS (Mac mode)");
BootLogoImage = LoadOSIcon(Entry->Volume->OSIconName, L"legacy", TRUE);
if (BootLogoImage != NULL)
// Start a device on a non-Mac using the EFI_LEGACY_BIOS_PROTOCOL
#ifdef __MAKEWITH_TIANO
-static VOID StartLegacyNonMac(IN LEGACY_ENTRY *Entry)
+static VOID StartLegacyUEFI(IN LEGACY_ENTRY *Entry)
{
+ BeginExternalScreen(TRUE, L"Booting Legacy OS (UEFI mode)");
+
BdsLibConnectDevicePath (Entry->BdsOption->DevicePath);
BdsLibDoLegacyBoot(Entry->BdsOption);
-}
+
+ // If we get here, it means that there was a failure....
+ Print(L"Failure booting legacy (BIOS) OS.");
+ PauseForKey();
+ FinishExternalScreen();
+} // static VOID StartLegacyUEFI()
#endif // __MAKEWITH_TIANO
static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume)
#ifdef __MAKEWITH_TIANO
+// default volume badge icon based on disk kind
+static EG_IMAGE * GetDiskBadge(IN UINTN DiskType) {
+ EG_IMAGE * Badge = NULL;
+
+ switch (DiskType) {
+ case BBS_HARDDISK:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_INTERNAL);
+ break;
+ case BBS_USB:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_EXTERNAL);
+ break;
+ case BBS_CDROM:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_OPTICAL);
+ break;
+ } // switch()
+ return Badge;
+} // static EG_IMAGE * GetDiskBadge()
+
/**
Create a rEFInd boot option from a Legacy BIOS protocol option.
*/
-static LEGACY_ENTRY * AddLegacyEntryNonMac(BDS_COMMON_OPTION *BdsOption, IN UINT16 DiskType)
+static LEGACY_ENTRY * AddLegacyEntryUEFI(BDS_COMMON_OPTION *BdsOption, IN UINT16 DiskType)
{
LEGACY_ENTRY *Entry, *SubEntry;
REFIT_MENU_SCREEN *SubScreen;
Entry->me.Image = LoadOSIcon(L"legacy", L"legacy", TRUE);
Entry->LoadOptions = (DiskType == BBS_CDROM) ? L"CD" :
((DiskType == BBS_USB) ? L"USB" : L"HD");
- Entry->me.BadgeImage = NULL;
- Entry->BdsOption = BdsOption;
+ Entry->me.BadgeImage = GetDiskBadge(DiskType);
+// Entry->me.BadgeImage = Volume->VolBadgeImage;
+ Entry->BdsOption = BdsOption;
Entry->Enabled = TRUE;
// create the submenu
Entry->me.SubScreen = SubScreen;
AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry);
return Entry;
-} /* static LEGACY_ENTRY * AddLegacyEntryNonMac() */
+} /* static LEGACY_ENTRY * AddLegacyEntryUEFI() */
/**
Scan for legacy BIOS targets on machines that implement EFI_LEGACY_BIOS_PROTOCOL.
In testing, protocol has not been implemented on Macs but has been
implemented on several Dell PCs and an ASUS motherboard.
+ Restricts output to disks of the specified DiskType.
*/
-static VOID ScanLegacyNonMac(IN UINTN DiskType)
+static VOID ScanLegacyUEFI(IN UINTN DiskType)
{
EFI_STATUS Status;
EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;
BDS_COMMON_OPTION *BdsOption;
LIST_ENTRY TempList;
BBS_BBS_DEVICE_PATH * BbsDevicePath = NULL;
+// REFIT_VOLUME Volume;
InitializeListHead (&TempList);
ZeroMem (Buffer, sizeof (Buffer));
// If LegacyBios protocol is not implemented on this platform, then
//we do not support this type of legacy boot on this machine.
- Status = gBS->LocateProtocol (&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios);
+ Status = gBS->LocateProtocol(&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios);
if (EFI_ERROR (Status))
return;
// Grab the boot order
- BootOrder = BdsLibGetVariableAndSize (L"BootOrder", &gEfiGlobalVariableGuid, &BootOrderSize);
+ BootOrder = BdsLibGetVariableAndSize(L"BootOrder", &gEfiGlobalVariableGuid, &BootOrderSize);
if (BootOrder == NULL) {
BootOrderSize = 0;
}
UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", BootOrder[Index]);
BdsOption = BdsLibVariableToOption (&TempList, BootOption);
- if(BdsOption != NULL) {
+ if (BdsOption != NULL) {
//Print(L"Option description = '%s'\n", BdsOption->Description);
BbsDevicePath = (BBS_BBS_DEVICE_PATH *)BdsOption->DevicePath;
// Only add the entry if it is of a supported type (e.g. USB, HD)
// See BdsHelper.c for currently supported types
if (BbsDevicePath->DeviceType == DiskType) {
-// if(IsBbsDeviceTypeSupported(BbsDevicePath->DeviceType)) {
- AddLegacyEntryNonMac(BdsOption, BbsDevicePath->DeviceType);
+ AddLegacyEntryUEFI(BdsOption, BbsDevicePath->DeviceType);
}
}
Index++;
}
-} /* static VOID ScanLegacyNonMac() */
+} /* static VOID ScanLegacyUEFI() */
#else
-static VOID ScanLegacyNonMac(IN UINTN DiskType){}
+static VOID ScanLegacyUEFI(IN UINTN DiskType){}
#endif // __MAKEWITH_TIANO
static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) {
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_CDROM);
+ ScanLegacyUEFI(BBS_CDROM);
}
} /* static VOID ScanLegacyDisc() */
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_HARDDISK);
+ ScanLegacyUEFI(BBS_HARDDISK);
}
} /* static VOID ScanLegacyInternal() */
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_USB);
+ ScanLegacyUEFI(BBS_USB);
}
} /* static VOID ScanLegacyExternal() */
ConnectAllDriversToAllControllers();
} /* static VOID LoadDrivers() */
-
-static VOID ScanForBootloaders(VOID) {
- UINTN i;
+// Determine what (if any) type of legacy (BIOS) boot support is available
+static VOID FindLegacyBootType(VOID) {
#ifdef __MAKEWITH_TIANO
EFI_STATUS Status;
EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;
#endif
- ScanVolumes();
+ GlobalConfig.LegacyType = LEGACY_TYPE_NONE;
+ // UEFI-style legacy BIOS support is available only with the TianoCore EDK2
+ // build environment, and then only with some implementations....
#ifdef __MAKEWITH_TIANO
- // Check for UEFI-style legacy BIOS support. If present, set the appropriate
- // GlobalConfig flag for it.
Status = gBS->LocateProtocol (&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios);
if (!EFI_ERROR (Status))
GlobalConfig.LegacyType = LEGACY_TYPE_UEFI;
#endif
+ // Macs have their own system. If the firmware vendor code contains the
+ // string "Apple", assume it's available. Note that this overrides the
+ // UEFI type, and might yield false positives if the vendor string
+ // contains "Apple" as part of something bigger, so this isn't 100%
+ // perfect.
+ if (StriSubCmp(L"Apple", ST->FirmwareVendor))
+ GlobalConfig.LegacyType = LEGACY_TYPE_MAC;
+} // static VOID FindLegacyBootType
+
+// Locates boot loaders. NOTE: This assumes that GlobalConfig.LegacyType is set correctly.
+static VOID ScanForBootloaders(VOID) {
+ UINTN i;
+
+ ScanVolumes();
+
// scan for loaders and tools, add them to the menu
for (i = 0; i < NUM_SCAN_OPTIONS; i++) {
switch(GlobalConfig.ScanFor[i]) {
refit_call4_wrapper(BS->SetWatchdogTimer, 0x0000, 0x0000, 0x0000, NULL);
// further bootstrap (now with config available)
+ FindLegacyBootType();
SetupScreen();
if (GlobalConfig.ScanDelay > 0) {
BGColor.b = 255;
#ifdef __MAKEWITH_TIANO
case TAG_LEGACY_NON_MAC: // Boot a legacy OS on a non-Mac
- StartLegacyNonMac((LEGACY_ENTRY *)ChosenEntry);
+ StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry);
break;
#endif // __MAKEWITH_TIANO