From 491e51beeb97ced2951942755bbf12a23382a10f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 21 Aug 2017 10:03:52 +0200 Subject: [PATCH] Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" This reverts commit edb0a5937e30477f633550c18c87cdfa6c2a5827. --- src/neutrino.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5096e75d9..be0782f00 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -485,16 +485,8 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.hdd_noise = configfile.getInt32( "hdd_noise", 254); 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; - 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_rcdelay = configfile.getBool("shutdown_real_rcdelay", false ); g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0); @@ -2294,9 +2286,6 @@ TIMER_START(); CheckFastScan(); - // init hw_caps *after* zapit start! - g_info.hw_caps = get_hwcaps(); - //timer start long timerd_signal = 0; timer_wakeup = false;//init