Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-01-25 21:31:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

ProvideConsoleGop setting in GUI.

Browse Source
This commit is contained in:
jief666 2020-09-29 15:15:11 +03:00
parent 48cdadb0b2
commit bd8d3140b2
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rEFIt_UEFI/Platform/Injectors.cpp
View File

@ -40,7 +40,6 @@
extern EFI_GUID gEfiDevicePathPropertyDatabaseProtocolGuid; extern EFI_GUID gEfiDevicePathPropertyDatabaseProtocolGuid;
extern EFI_GUID gAppleFramebufferInfoProtocolGuid; extern EFI_GUID gAppleFramebufferInfoProtocolGuid;
extern BOOLEAN gProvideConsoleGopEnable;
UINT32 mPropSize = 0; UINT32 mPropSize = 0;
UINT8* mProperties = NULL; UINT8* mProperties = NULL;

6
rEFIt_UEFI/Platform/Settings.cpp
View File

@ -139,7 +139,6 @@ EMU_VARIABLE_CONTROL_PROTOCOL *gEmuVariableControl = NULL;
extern BOOLEAN NeedPMfix; extern BOOLEAN NeedPMfix;
//OC_ABC_SETTINGS_4CLOVER gQuirks; //OC_ABC_SETTINGS_4CLOVER gQuirks;
BOOLEAN gProvideConsoleGopEnable;
//extern INTN OldChosenAudio; //extern INTN OldChosenAudio;
@ -2576,6 +2575,9 @@ GetEarlyUserSettings (
} }
} }
Prop = GUIDict->propertyForKey("ProvideConsoleGop");
gSettings.ProvideConsoleGop = IsPropertyNotNullAndTrue(Prop);
Prop = GUIDict->propertyForKey("ConsoleMode"); Prop = GUIDict->propertyForKey("ConsoleMode");
if (Prop != NULL) { if (Prop != NULL) {
if (Prop->isInt64()) { if (Prop->isInt64()) {
@ -2956,8 +2958,6 @@ if ( !Prop ) panic("Cannot find AvoidRuntimeDefrag in OcQuirks under root (OC bo
Prop = OcQuirksDict->propertyForKey( "ProtectUefiServices"); Prop = OcQuirksDict->propertyForKey( "ProtectUefiServices");
gSettings.ocBooterQuirks.ProtectUefiServices = IsPropertyNotNullAndTrue(Prop); gSettings.ocBooterQuirks.ProtectUefiServices = IsPropertyNotNullAndTrue(Prop);
gSettings.QuirksMask |= gSettings.ocBooterQuirks.ProtectUefiServices? QUIRK_UEFI:0; gSettings.QuirksMask |= gSettings.ocBooterQuirks.ProtectUefiServices? QUIRK_UEFI:0;
Prop = OcQuirksDict->propertyForKey( "ProvideConsoleGopEnable");
gProvideConsoleGopEnable = IsPropertyNotNullAndTrue(Prop);
Prop = OcQuirksDict->propertyForKey( "ProvideCustomSlide"); Prop = OcQuirksDict->propertyForKey( "ProvideCustomSlide");
gSettings.ocBooterQuirks.ProvideCustomSlide = IsPropertyNotNullAndTrue(Prop); gSettings.ocBooterQuirks.ProvideCustomSlide = IsPropertyNotNullAndTrue(Prop);
gSettings.QuirksMask |= gSettings.ocBooterQuirks.ProvideCustomSlide? QUIRK_CUSTOM:0; gSettings.QuirksMask |= gSettings.ocBooterQuirks.ProvideCustomSlide? QUIRK_CUSTOM:0;

4
rEFIt_UEFI/Platform/Settings.h
View File

@ -606,6 +606,8 @@ public:
OC_BOOTER_QUIRKS ocBooterQuirks; OC_BOOTER_QUIRKS ocBooterQuirks;
XObjArray<MMIOWhiteList> mmioWhiteListArray; XObjArray<MMIOWhiteList> mmioWhiteListArray;
BOOLEAN ProvideConsoleGop;
SETTINGS_DATA() : VendorName(), RomVersion(), EfiVersion(), ReleaseDate(), ManufactureName(), ProductName(), VersionNr(), SerialNr(), SmUUID(), SETTINGS_DATA() : VendorName(), RomVersion(), EfiVersion(), ReleaseDate(), ManufactureName(), ProductName(), VersionNr(), SerialNr(), SmUUID(),
pad0{0}, FamilyName(), OEMProduct(), OEMVendor(), BoardManufactureName(), BoardSerialNumber(), BoardNumber(), LocationInChassis(), pad0{0}, FamilyName(), OEMProduct(), OEMVendor(), BoardManufactureName(), BoardSerialNumber(), BoardNumber(), LocationInChassis(),
@ -633,7 +635,7 @@ public:
AFGLowPowerState(0), PNLF_UID(0), ACPIDropTables(0), DisableEntryScan(0), DisableToolScan(0), KernelScan(0), LinuxScan(0), CustomEntries(0), AFGLowPowerState(0), PNLF_UID(0), ACPIDropTables(0), DisableEntryScan(0), DisableToolScan(0), KernelScan(0), LinuxScan(0), CustomEntries(0),
CustomLegacy(0), CustomTool(0), NrAddProperties(0), AddProperties(0), BlockKexts{0}, SortedACPICount(0), SortedACPI(0), DisabledAMLCount(0), DisabledAML(0), CustomLegacy(0), CustomTool(0), NrAddProperties(0), AddProperties(0), BlockKexts{0}, SortedACPICount(0), SortedACPI(0), DisabledAMLCount(0), DisabledAML(0),
IntelMaxValue(0), OptionsBits(0), FlagsBits(0), UIScale(0), EFILoginHiDPI(0), flagstate{0}, IntelMaxValue(0), OptionsBits(0), FlagsBits(0), UIScale(0), EFILoginHiDPI(0), flagstate{0},
ArbProperties(0), QuirksMask(0), MaxSlide(0), ocBooterQuirks{0}, mmioWhiteListArray() ArbProperties(0), QuirksMask(0), MaxSlide(0), ocBooterQuirks{0}, mmioWhiteListArray(), ProvideConsoleGop(0)
{}; {};
SETTINGS_DATA(const SETTINGS_DATA& other) = delete; // Can be defined if needed SETTINGS_DATA(const SETTINGS_DATA& other) = delete; // Can be defined if needed
const SETTINGS_DATA& operator = ( const SETTINGS_DATA & ) = delete; // Can be defined if needed const SETTINGS_DATA& operator = ( const SETTINGS_DATA & ) = delete; // Can be defined if needed

2
rEFIt_UEFI/refit/main.cpp
View File

@ -1600,7 +1600,7 @@ DBG("Beginning OC\n");
#ifndef USE_OC_SECTION_PlatformInfo #ifndef USE_OC_SECTION_PlatformInfo
mOpenCoreConfiguration.Kernel.Quirks.CustomSmbiosGuid = false; //already done by CLover. mOpenCoreConfiguration.Kernel.Quirks.CustomSmbiosGuid = false; //already done by CLover.
#endif #endif
// mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = true; mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = gSettings.ProvideConsoleGop;
OC_STRING_ASSIGN(mOpenCoreConfiguration.Uefi.Output.Resolution, XString8(GlobalConfig.ScreenResolution).c_str()); OC_STRING_ASSIGN(mOpenCoreConfiguration.Uefi.Output.Resolution, XString8(GlobalConfig.ScreenResolution).c_str());
OcMain(&mOpenCoreStorage, NULL); OcMain(&mOpenCoreStorage, NULL);

7
rEFIt_UEFI/refit/menu.cpp
View File

@ -80,7 +80,6 @@ extern OC_GLOBAL_CONFIG mOpenCoreConfiguration;
#endif #endif
extern CONST CHAR8 *AudioOutputNames[]; extern CONST CHAR8 *AudioOutputNames[];
extern BOOLEAN gProvideConsoleGopEnable;
INTN LayoutMainMenuHeight = 376; INTN LayoutMainMenuHeight = 376;
INTN LayoutAnimMoveForMenuX = 0; INTN LayoutAnimMoveForMenuX = 0;
@ -448,7 +447,7 @@ VOID FillInputs(BOOLEAN New)
InputItems[InputItemsCount].ItemType = Decimal; //122 InputItems[InputItemsCount].ItemType = Decimal; //122
InputItems[InputItemsCount++].SValue.SWPrintf("%04lld", gSettings.MaxSlide); InputItems[InputItemsCount++].SValue.SWPrintf("%04lld", gSettings.MaxSlide);
InputItems[InputItemsCount].ItemType = BoolValue; //123 InputItems[InputItemsCount].ItemType = BoolValue; //123
InputItems[InputItemsCount++].BValue = gProvideConsoleGopEnable; InputItems[InputItemsCount++].BValue = gSettings.ProvideConsoleGop;
@ -1073,8 +1072,8 @@ VOID ApplyInputs(VOID)
} }
i++; //123 i++; //123
if (InputItems[i].Valid) { if (InputItems[i].Valid) {
gProvideConsoleGopEnable = InputItems[i].BValue; gSettings.ProvideConsoleGop = InputItems[i].BValue;
DBG("applied ConsoleGopEnable=%s\n", gProvideConsoleGopEnable?"Y":"N"); DBG("applied ConsoleGopEnable=%s\n", gSettings.ProvideConsoleGop ? "Y" : "N" );
} }