Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix and clean Version.h include.

Browse Source
This commit is contained in:
jief 2020-04-16 14:19:37 +03:00
parent ea2cb13808
commit 81c0b45e45
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rEFIt_UEFI/Platform/Settings.cpp
View File

@ -29,6 +29,7 @@
#include "../include/Pci.h"
#include "../include/Devices.h"
#include "ati_reg.h"
#include "../../Version.h"
#ifndef DEBUG_ALL
#define DEBUG_SET 1
@ -130,9 +131,10 @@ DRIVERS_FLAGS gDriversFlags; //the initializer is not needed for global variabl
//CONST CHAR16 gFirmwareRevisionM[] = FIRMWARE_REVISION;
//CONST CHAR16 *gFirmwareRevision = &gFirmwareRevisionM[0];
CONST CHAR16 *gFirmwareRevision = FIRMWARE_REVISION;
CONST CHAR8* gRevisionStr = REVISION_STR;
#else
CONST CHAR16 *gFirmwareRevision = NULL;
CONST CHAR8* gRevisionStr = NULL;
#endif
EFI_GUID gUuid;

2
rEFIt_UEFI/Platform/Settings.h
View File

@ -664,7 +664,9 @@ extern SIDELOAD_KEXT *InjectKextList;
// Hold theme fixed IconFormat / extension
extern CHAR16 *IconFormat;
extern CONST CHAR16 *gFirmwareRevision;
extern CONST CHAR8* gRevisionStr;
extern BOOLEAN ResumeFromCoreStorage;
extern BOOLEAN gRemapSmBiosIsRequire; // syscl: pass argument for Dell SMBIOS here

11
rEFIt_UEFI/Platform/smbios.cpp
View File

@ -21,7 +21,6 @@
#include "Platform.h"
#include "smbios.h"
#include "../../Version.h"
#include "cpu.h"
#include "platformdata.h"
#include "AcpiPatcher.h"
@ -1106,11 +1105,11 @@ VOID PatchTableType11()
// AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.EfiVersion, iStrLen(gSettings.EfiVersion, 64));
AsciiStrCatS(OEMString, MAX_OEM_STRING, " Board-ID : ");
AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.BoardNumber, iStrLen(gSettings.BoardNumber, 64));
#ifdef REVISION_STR
snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by %s\n", REVISION_STR);
#else
snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover %s\n", gFirmwareRevision);
#endif
//#ifdef REVISION_STR
// snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by %s\n", REVISION_STR);
//#else
snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover %ls\n", gFirmwareRevision);
//#endif
AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev);
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString);

1
rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
View File

@ -38,7 +38,6 @@
#include "../libeg/libegint.h" //this includes platform.h
//#include "../include/scroll_images.h"
#include "../../Version.h"
//#include "colors.h"
#include "../libeg/nanosvg.h"

5
rEFIt_UEFI/refit/main.cpp
View File

@ -39,7 +39,6 @@
#include "../cpp_util/globals_dtor.h"
#include "../cpp_unit_test/all_tests.h"
#include "Version.h"
#include "../entry_scan/entry_scan.h"
#include "../libeg/nanosvg.h"
#include "../gui/menu_items/menu_globals.h"
@ -1943,7 +1942,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
// firmware detection
gFirmwareClover = StrCmp(gST->FirmwareVendor, L"CLOVER") == 0;
if (!gFirmwareRevision) {
gFirmwareRevision = PoolPrint(L"%d", gST->FirmwareRevision);
// gFirmwareRevision = PoolPrint(L"%d", gST->FirmwareRevision);
}
InitializeConsoleSim();
InitBooterLog();
@ -1959,7 +1958,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second, GlobalConfig.Timezone);
}
//MsgLog("Starting Clover rev %ls on %ls EFI\n", FIRMWARE_REVISION, gST->FirmwareVendor);
MsgLog("Starting %s on %ls EFI\n", REVISION_STR, gST->FirmwareVendor);
MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor);
#ifdef BUILDINFOS_STR
DBG("Build with: [%s]\n", BUILDINFOS_STR);

3
rEFIt_UEFI/refit/menu.cpp
View File

@ -40,7 +40,6 @@
//#include "../include/scroll_images.h"
#include "../Platform/Settings.h"
#include "../../Version.h"
//#include "colors.h"
#include "../libeg/nanosvg.h"
@ -1221,7 +1220,7 @@ VOID AboutRefit(VOID)
#ifdef REVISION_STR
AboutMenu.AddMenuInfo_f(" %s ", REVISION_STR);
#else
AboutMenu.AddMenuInfo_f("Clover Revision %s", gFirmwareRevision);
AboutMenu.AddMenuInfo_f("Clover Revision %ls", gFirmwareRevision);
#endif
#ifdef FIRMWARE_BUILDDATE
AboutMenu.AddMenuInfo_f(" Build: %s", FIRMWARE_BUILDDATE);