mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +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

11
src/gui/update.h
View File

@@ -38,7 +38,8 @@
#include <gui/widget/progresswindow.h>
#ifdef BOXMODEL_CS_HD2
//#include <driver/framebuffer.h>
#ifdef BOXMODEL_CST_HD2
#include <system/mtdutils/mkfs.jffs2.h>
#endif
@@ -82,13 +83,13 @@ class CFlashExpert : public CProgressWindow
int showFileSelector(const std::string & actionkey);
bool checkSize(int mtd, std::string &backupFile);
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
bool readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable);
void readmtdJFFS2(std::string &filename, std::string title="", std::string path="/", bool makeDevTable=true);
#endif
public:
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
bool forceOtherFilename;
std::string otherFilename;
int createimage_other;
@@ -101,7 +102,7 @@ class CFlashExpert : public CProgressWindow
};
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
class CFlashExpertSetup : public CMenuTarget
{
private:
@@ -116,6 +117,6 @@ class CFlashExpertSetup : public CMenuTarget
int exec(CMenuTarget* parent, const std::string &actionKey);
};
#endif // BOXMODEL_CS_HD2
#endif // BOXMODEL_CST_HD2
#endif