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

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 3e2e647745 af662827d5
commit 7cfe54dc2f
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/flashtool.cpp
View File

@@ -583,22 +583,30 @@ std::string CMTDInfo::getMTDName(const int pos)
{
// TODO: check /proc/mtd specification to determine mtdname encoding
return FILESYSTEM_ENCODING_TO_UTF8_STRING(mtdData[pos]->name);
if (pos >= 0)
return FILESYSTEM_ENCODING_TO_UTF8_STRING(mtdData[pos]->name);
return "";
}
std::string CMTDInfo::getMTDFileName(const int pos)
{
return mtdData[pos]->filename;
if (pos >= 0)
return mtdData[pos]->filename;
return "";
}
int CMTDInfo::getMTDSize(const int pos)
{
return mtdData[pos]->size;
if (pos >= 0)
return mtdData[pos]->size;
return 0;
}
int CMTDInfo::getMTDEraseSize(const int pos)
{
return mtdData[pos]->erasesize;
if (pos >= 0)
return mtdData[pos]->erasesize;
return 0;
}
int CMTDInfo::findMTDNumber(const std::string & filename)
@@ -630,7 +638,11 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
std::string CMTDInfo::findMTDsystem()
{
#ifdef BOXMODEL_APOLLO
std::string sysfs = "root0";
#else
std::string sysfs = "systemFS";
#endif
for(int i = 0; i < getMTDCount(); i++) {
if(getMTDName(i) == sysfs) {