mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-11 23:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename BOXMODEL_CS => BOXMODEL_CST

Browse Source 
Conflicts:
	data/scripts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/imageinfo_ni.cpp
	src/gui/osd_setup.cpp
	src/gui/update.cpp
	src/gui/update.h
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-03 22:07:12 +02:00
committed by Thilo Graf
parent d29c98d7d5
commit a9882cdc22
34 changed files with 121 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/Makefile.am
View File

@@ -1,4 +1,4 @@
if BOXMODEL_CS_HD2
if BOXMODEL_CST_HD2
SUBDIRS = mtdutils
endif

4
src/system/flashtool.cpp
View File

@@ -187,7 +187,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
std::string flashfile;
bool skipCopy = false;
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (strcmp(dn, "/tmp") != 0) {
uint64_t btotal = 0, bused = 0;
long bsize = 0;
@@ -697,7 +697,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
std::string CMTDInfo::findMTDsystem()
{
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
std::string sysfs = "root0";
#else
std::string sysfs = "systemFS";

7
src/system/setting_helpers.cpp
View File

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

2
src/system/settings.h
View File

@@ -303,7 +303,7 @@ struct SNeutrinoSettings
int psi_step;
#endif
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
int brightness;
int contrast;
int saturation;