mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"

Browse Source 
This reverts commit edb0a5937e.
This commit is contained in:
Jacek Jendrzej
2017-08-21 10:03:52 +02:00
parent ed416416cd
commit 491e51beeb
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/neutrino.cpp
View File

@@ -485,16 +485,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.hdd_noise = configfile.getInt32( "hdd_noise", 254); g_settings.hdd_noise = configfile.getInt32( "hdd_noise", 254);
g_settings.hdd_statfs_mode = configfile.getInt32( "hdd_statfs_mode", SNeutrinoSettings::HDD_STATFS_RECORDING); g_settings.hdd_statfs_mode = configfile.getInt32( "hdd_statfs_mode", SNeutrinoSettings::HDD_STATFS_RECORDING);
/*
hw_caps needs CFEManager and CFEManager needs g_settings.
So loadSetup() cannot use hw_caps to init g_settings.
For this reason we need this workaround.
*/
bool can_shutdown = (cs_get_revision() > 7);
g_settings.shutdown_real = false; g_settings.shutdown_real = false;
if (can_shutdown) //(g_info.hw_caps->can_shutdown) if (g_info.hw_caps->can_shutdown)
g_settings.shutdown_real = configfile.getBool("shutdown_real" , false ); g_settings.shutdown_real = configfile.getBool("shutdown_real" , false );
g_settings.shutdown_real_rcdelay = configfile.getBool("shutdown_real_rcdelay", false ); g_settings.shutdown_real_rcdelay = configfile.getBool("shutdown_real_rcdelay", false );
g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0); g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0);
@@ -2294,9 +2286,6 @@ TIMER_START();
CheckFastScan(); CheckFastScan();
// init hw_caps *after* zapit start!
g_info.hw_caps = get_hwcaps();
//timer start //timer start
long timerd_signal = 0; long timerd_signal = 0;
timer_wakeup = false;//init timer_wakeup = false;//init