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 'next' into next-cc

Browse Source 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
This commit is contained in:
[CST] Focus
2013-06-02 10:46:42 +04:00
parent 0128a61708 83c7de004e
commit 6f8ef9ec46
35 changed files with 1525 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/flashtool.cpp
View File

@@ -101,13 +101,7 @@ bool CFlashTool::readFromMTD( const std::string & filename, int globalProgressEn
filesize = CMTDInfo::getInstance()->getMTDSize(mtdDevice);
unsigned char * buf = new unsigned char[meminfo.writesize];
if (buf == NULL) {
printf("CFlashTool::program: mem alloc failed\n");
close(fd);
close(fd1);
return false;
}
unsigned char buf[meminfo.writesize];
unsigned mtdoffset = 0;
long fsize = filesize;
while(fsize > 0) {
@@ -150,7 +144,6 @@ bool CFlashTool::readFromMTD( const std::string & filename, int globalProgressEn
if(statusViewer)
statusViewer->showLocalStatus(100);
delete[] buf;
close(fd);
close(fd1);
return true;
@@ -211,13 +204,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
if(statusViewer)
globalProgressBegin = statusViewer->getGlobalStatus();
unsigned char * buf = new unsigned char[meminfo.writesize];
if (buf == NULL) {
printf("CFlashTool::program: mem alloc failed\n");
close(fd);
close(fd1);
return false;
}
unsigned char buf[meminfo.writesize];
unsigned mtdoffset = 0;
unsigned fsize = filesize;
printf("CFlashTool::program: file %s write size %d, erase size %d\n", filename.c_str(), meminfo.writesize, meminfo.erasesize);
@@ -270,7 +257,6 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
if(statusViewer)
statusViewer->showLocalStatus(100);
delete[] buf;
close(fd1);
close(fd);
// FIXME error message
@@ -290,7 +276,7 @@ bool CFlashTool::getInfo()
meminfo.writesize = 1024;
isnand = (meminfo.type == MTD_NANDFLASH);
printf("CFlashTool::getInfo: NAND: %s\n", isnand ? "yes" : "no");
printf("CFlashTool::getInfo: NAND: %s writesize %d\n", isnand ? "yes" : "no", meminfo.writesize);
return true;
}