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

- pick mipsbox code from DDT, TangoCash and max10

Browse Source 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-05-03 22:50:45 +02:00
committed by Thilo Graf
parent 15e8b2d5ea
commit 8991ed60f4
25 changed files with 148 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/update.cpp
View File

@@ -78,7 +78,7 @@
#include <cs_api.h>
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include <hardware/video.h>
extern cVideo * videoDecoder;
#endif
@@ -94,7 +94,7 @@ extern int allow_flash;
#define LIST_OF_UPDATES_LOCAL_FILENAME "update.list"
// TODO: move this mess below to libstb-hal
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#define FILEBROWSER_UPDATE_FILTER "tgz"
#define MTD_OF_WHOLE_IMAGE 999
#define MTD_DEVICE_OF_UPDATE_PART "/dev/mtd999"
@@ -361,7 +361,8 @@ bool CFlashUpdate::selectHttpImage(void)
}
}
#endif
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if ((fileType <= '2') && (filename.substr(filename.find_last_of(".") + 1) == "tgz"))
{
// manipulate fileType for tgz-packages
@@ -631,8 +632,8 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
free(buffer);
}
}
#if HAVE_ARM_HARDWARE
else if (fileType == 'Z')
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
else if (fileType == 'Z') // flashing image with ofgwrite
{
showGlobalStatus(100);