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

Search mtd device to update by name

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@581 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-05-12 12:10:12 +00:00
parent e5e0ee0185
commit d133701c83
5 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/update.cpp
View File

@@ -83,6 +83,8 @@ CFlashUpdate::CFlashUpdate()
:CProgressWindow()
{
setTitle(LOCALE_FLASHUPDATE_HEAD);
sysfs = CMTDInfo::getInstance()->findMTDsystem();
printf("Mtd partition to update: %s\n", sysfs.c_str());
}
@@ -358,6 +360,11 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
paint();
if(sysfs.size() < 8) {
ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_CANTOPENMTD));
hide();
return menu_return::RETURN_REPAINT;
}
if(!checkVersion4Update()) {
hide();
return menu_return::RETURN_REPAINT;
@@ -389,7 +396,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
showGlobalStatus(40);
CFlashTool ft;
ft.setMTDDevice(MTD_DEVICE_OF_UPDATE_PART);
//ft.setMTDDevice(MTD_DEVICE_OF_UPDATE_PART);
ft.setMTDDevice(sysfs);
ft.setStatusViewer(this);
showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_MD5CHECK)); // UTF-8

1
src/gui/update.h
View File

@@ -46,6 +46,7 @@ class CFlashUpdate : public CProgressWindow
private:
std::string filename;
std::string file_md5;
std::string sysfs;
char fileType;
std::string installedVersion;

42
src/neutrino_menue.cpp
View File

@@ -461,6 +461,7 @@ public:
#include <net/if.h>
#include <arpa/inet.h>
extern int cs_test_card(int unit, char * str);
int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{
if (parent)
@@ -527,7 +528,43 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
close(fd);
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
}
else if (actionKey == "card") {
else if (actionKey == "card0") {
char str[255];
int ret = cs_test_card(0, str);
switch(ret) {
case 0:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
break;
case -1:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 1 ATR read failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
case -2:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 1 reset failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
default:
case -3:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 1 open failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
}
}
else if (actionKey == "card1") {
char str[255];
int ret = cs_test_card(1, str);
switch(ret) {
case 0:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
break;
case -1:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 2 ATR read failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
case -2:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 2 reset failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
default:
case -3:
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Smardcard 2 open failed", CMessageBox::mbrBack, CMessageBox::mbBack, "info");
break;
}
}
else if (actionKey == "hdd") {
char buffer[255];
@@ -643,7 +680,8 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
CTestMenu * testHandler = new CTestMenu();
TestMenu->addItem(new CMenuForwarderNonLocalized("VFD", true, NULL, testHandler, "vfd"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Network", true, NULL, testHandler, "network"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Smartcard", true, NULL, testHandler, "card"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Smartcard 1", true, NULL, testHandler, "card0"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Smartcard 2", true, NULL, testHandler, "card1"));
TestMenu->addItem(new CMenuForwarderNonLocalized("HDD", true, NULL, testHandler, "hdd"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Buttons", true, NULL, testHandler, "buttons"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Scan 12538000", true, NULL, testHandler, "scan"));

13
src/system/flashtool.cpp
View File

@@ -539,3 +539,16 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
{
return getMTDEraseSize( findMTDNumber(filename) );
}
std::string CMTDInfo::findMTDsystem()
{
std::string sysfs = "systemFS";
for(int i = 0; i < getMTDCount(); i++) {
if(getMTDName(i) == sysfs) {
printf("systemFS: %d dev %s\n", i, getMTDFileName(i).c_str());
return getMTDFileName(i);
}
}
return "";
}

2
src/system/flashtool.h
View File

@@ -124,7 +124,7 @@ class CMTDInfo
int getMTDEraseSize( const std::string & filename );
int findMTDNumber(const std::string & filename);
std::string findMTDsystem();
};