mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/pu/fb-modules'

Browse Source 
only compile tested ;-)
This commit is contained in:
Stefan Seyfried
2017-02-12 21:29:10 +01:00
parent c266891a71 987dbe7f1d
commit 2819e651c3
45 changed files with 859 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/update.h
View File

@@ -38,7 +38,7 @@
#include <gui/widget/progresswindow.h>
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#include <system/mtdutils/mkfs.jffs2.h>
#endif
@@ -80,13 +80,13 @@ class CFlashExpert : public CProgressWindow
int showFileSelector(const std::string & actionkey);
bool checkSize(int mtd, std::string &backupFile);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_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_APOLLO
#ifdef BOXMODEL_CS_HD2
bool forceOtherFilename;
std::string otherFilename;
int createimage_other;
@@ -99,7 +99,7 @@ class CFlashExpert : public CProgressWindow
};
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
class CFlashExpertSetup : public CMenuTarget
{
private:
@@ -114,6 +114,6 @@ class CFlashExpertSetup : public CMenuTarget
int exec(CMenuTarget* parent, const std::string &actionKey);
};
#endif // BOXMODEL_APOLLO
#endif // BOXMODEL_CS_HD2
#endif