Restore Device properties injection.

Uncomment SetCPUProperties() SetupDataForOSX()
This commit is contained in:
jief666 2020-09-23 08:20:06 +03:00
parent e868a7dbfa
commit b592a62d6f
3 changed files with 23 additions and 22 deletions

View File

@ -5243,6 +5243,8 @@ VOID RenameDevices(UINT8* table)
CHAR8 *Replace;
CHAR8 *Find;
if ( gSettings.DeviceRenameCount <= 0 ) return; // to avoid message "0 replacement"
INTN i;
INTN k=0; // Cland complain about possible use uninitialised. Not true, but I don't like warnings.
UINTN index;

View File

@ -379,12 +379,11 @@ SetPrivateVarProto(VOID)
NULL
);
//obligatory protocol
// jief : disabled, OC does it.
// Status = gBS->InstallProtocolInterface (&gImageHandle,
// &gEfiDevicePathPropertyDatabaseProtocolGuid,
// EFI_NATIVE_INTERFACE,
// &mDeviceProperties
// );
Status = gBS->InstallProtocolInterface (&gImageHandle,
&gEfiDevicePathPropertyDatabaseProtocolGuid,
EFI_NATIVE_INTERFACE,
&mDeviceProperties
);
return Status;
}

View File

@ -1287,21 +1287,21 @@ VOID LOADER_ENTRY::StartLoader11()
// EventsInitialize(this);
// DBG("FinalizeSmbios\n");
FinalizeSmbios();
//
// SetCPUProperties();
//
// if (OSFLAG_ISSET(Flags, OSFLAG_HIBERNATED)) {
// DoHibernateWake = PrepareHibernation(Volume);
// }
// SetupDataForOSX(DoHibernateWake);
//
//
// if ( gDriversFlags.AptioFixLoaded &&
// !DoHibernateWake &&
// !LoadOptions.containsStartWithIC("slide=") ) {
// // Add slide=0 argument for ML+ if not present
// LoadOptions.AddID("slide=0"_XS8);
// }
SetCPUProperties();
if (OSFLAG_ISSET(Flags, OSFLAG_HIBERNATED)) {
DoHibernateWake = PrepareHibernation(Volume);
}
SetupDataForOSX(DoHibernateWake);
if ( gDriversFlags.AptioFixLoaded &&
!DoHibernateWake &&
!LoadOptions.containsStartWithIC("slide=") ) {
// Add slide=0 argument for ML+ if not present
LoadOptions.AddID("slide=0"_XS8);
}
if (gSettings.LastBootedVolume) {
if ( APFSTargetUUID.notEmpty() ) {
@ -1588,7 +1588,7 @@ DBG("Beginning OC\n");
mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = true;
OC_STRING_ASSIGN(mOpenCoreConfiguration.Uefi.Output.Resolution, "Max");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Uefi.Output.Resolution, XString8(GlobalConfig.ScreenResolution).c_str());
OcMain(&mOpenCoreStorage, NULL);