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

- use g_info.hw_caps->can_cpufreq to control the cpu frequency

Browse Source 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-08-30 22:49:37 +02:00
committed by Thilo Graf
parent 6491c66a66
commit 42b184f2e9
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/neutrino.cpp
View File

@@ -486,13 +486,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.zappingmode = configfile.getInt32( "zappingmode", 0);
#endif
#ifdef CPU_FREQ
g_settings.cpufreq = configfile.getInt32("cpufreq", 0);
g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100);
#else
g_settings.cpufreq = 0;
g_settings.standby_cpufreq = 50;
#endif
g_settings.cpufreq = g_info.hw_caps->can_cpufreq ? configfile.getInt32("cpufreq", 0) : 0;
g_settings.standby_cpufreq = g_info.hw_caps->can_cpufreq ? configfile.getInt32("standby_cpufreq", 100) : 50;
// ci-settings
g_settings.ci_standby_reset = configfile.getInt32("ci_standby_reset", 0);
@@ -2833,8 +2828,9 @@ TIMER_START();
powerManager = new cPowerManager;
powerManager->Open();
cpuFreq = new cCpuFreqManager();
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
cpuFreq = g_info.hw_caps->can_cpufreq ? new cCpuFreqManager() : NULL;
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
//fan speed
if (g_info.hw_caps->has_fan)
@@ -3564,7 +3560,8 @@ bool CNeutrinoApp::wakeupFromStandby(void)
CStreamManager::getInstance()->StreamStatus();
if ((mode == NeutrinoModes::mode_standby) && !alive) {
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
if(g_settings.ci_standby_reset) {
g_CamHandler->exec(NULL, "ca_ci_reset0");
g_CamHandler->exec(NULL, "ca_ci_reset1");
@@ -3591,7 +3588,8 @@ void CNeutrinoApp::standbyToStandby(void)
}
g_Zapit->setStandby(true);
g_Sectionsd->setPauseScanning(true);
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
}
}
@@ -4755,9 +4753,8 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
exec_controlscript(NEUTRINO_ENTER_STANDBY_SCRIPT);
CEpgScan::getInstance()->Start(true);
bool alive = recordingstatus || CEpgScan::getInstance()->Running() ||
CStreamManager::getInstance()->StreamStatus();
if(!alive)
bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus();
if (!alive && cpuFreq)
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
//fan speed
@@ -4778,8 +4775,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
// Active standby off
powerManager->SetStandby(false, false);
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowText("resume... ");
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
CVFD::getInstance()->ShowText("Resume ...");
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
videoDecoder->Standby(false);
CEpgScan::getInstance()->Stop();
CSectionsdClient::CurrentNextInfo dummy;