mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

NI \o/

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/system/flashtool.cpp
View File

@@ -44,6 +44,10 @@
#include <neutrino.h>
#include <driver/display.h>
//NI lcd4l-support
#include "gui/lcd4l.h"
extern CLCD4l *LCD4l;
CFlashTool::CFlashTool()
{
statusViewer = NULL;
@@ -230,6 +234,13 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
return false;
}
//NI
if(statusViewer) {
statusViewer->showLocalStatus(0);
statusViewer->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_ENTER_FLASH_SCRIPT)); // UTF-8
}
stopDaemons(); //NI
if(statusViewer) {
statusViewer->showLocalStatus(0);
statusViewer->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_ERASING)); // UTF-8
@@ -336,6 +347,15 @@ bool CFlashTool::getInfo()
return true;
}
//NI
void CFlashTool::stopDaemons()
{
if (g_settings.lcd4l_support)
LCD4l->StopLCD4l();
CNeutrinoApp::getInstance()->stopDaemonsForFlash();
}
bool CFlashTool::erase(int globalProgressEnd)
{
erase_info_t lerase;
@@ -353,7 +373,8 @@ bool CFlashTool::erase(int globalProgressEnd)
return false;
}
CNeutrinoApp::getInstance()->stopDaemonsForFlash();
//NI we're stopping daemons earlier in CFlashTool::stopDaemons()
//NI CNeutrinoApp::getInstance()->stopDaemonsForFlash();
#ifndef VFD_UPDATE
CVFD::getInstance()->ShowText("Erase Flash");
@@ -690,3 +711,17 @@ printf("systemFS: %d dev %s\n", i, getMTDFileName(i).c_str());
}
return "";
}
//NI
std::string CMTDInfo::findMTDkernel()
{
std::string kernel = "kernel";
for(int i = 0; i < getMTDCount(); i++) {
if(getMTDName(i) == kernel) {
printf("kernel: %d dev %s\n", i, getMTDFileName(i).c_str());
return getMTDFileName(i);
}
}
return "";
}