mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: Rename hardware defined macros for coolstream stb

Browse Source 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-12 07:33:01 +01:00
parent e8b36a1d80
commit 3664527019
26 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/setting_helpers.cpp
View File

@@ -528,7 +528,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
CServiceManager::getInstance()->SatelliteList().clear();
CZapit::getInstance()->LoadSettings();
CZapit::getInstance()->GetConfig(zapitCfg);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
/* flag file to erase /var partition on factory reset,
will be done by init scripts */
FILE * fp = fopen("/var_init/etc/.reset", "w");
@@ -566,7 +566,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
void CFanControlNotifier::setSpeed(unsigned int speed)
{
printf("FAN Speed %d\n", speed);
#ifndef BOXMODEL_APOLLO
#ifndef BOXMODEL_CS_HD2
int cfd = open("/dev/cs_control", O_RDONLY);
if(cfd < 0) {
perror("Cannot open /dev/cs_control");
@@ -607,7 +607,7 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
memset(modes, 0, sizeof(int)*VIDEO_STD_MAX+1);
for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
#else
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];