From 5e93178f9d44d58068dec6c57c636f245f7638da Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 15 Sep 2022 21:38:46 +0200 Subject: [PATCH] add multibox Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b4a0e72686c4d958391bd0aeed9016710c45725d Author: vanhofen Date: 2022-09-15 (Thu, 15 Sep 2022) Origin message was: ------------------ - add multibox ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 11 +++++++---- src/driver/rcinput.cpp | 2 +- src/driver/simple_display.cpp | 2 +- src/gui/videosettings.cpp | 2 +- src/neutrino.cpp | 6 +++--- src/nhttpd/tuxboxapi/controlapi.cpp | 2 +- src/system/helpers.cpp | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0596fc00d..94c4f9395 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -470,7 +470,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) AS_HELP_STRING([], [valid for coolstream: hd1, hd2]) -AS_HELP_STRING([], [valid for armbox: hd60, hd61, multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), [case "${withval}" in generic|raspi) @@ -499,7 +499,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -538,6 +538,7 @@ AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2") # armbox AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61") +AM_CONDITIONAL(BOXMODEL_MULTIBOX, test "$BOXMODEL" = "multibox") AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") @@ -605,6 +606,8 @@ elif test "$BOXMODEL" = "hd60"; then AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) elif test "$BOXMODEL" = "hd61"; then AC_DEFINE(BOXMODEL_HD61, 1, [hd61]) +elif test "$BOXMODEL" = "multibox"; then + AC_DEFINE(BOXMODEL_MULTIBOX, 1, [multibox]) elif test "$BOXMODEL" = "multiboxse"; then AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse]) @@ -692,7 +695,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true") # all hisilicon BOXMODELs case "$BOXMODEL" in - hd60|hd61|multiboxse) + hd60|hd61|multibox|multiboxse) AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon]) hisilicon=true ;; @@ -704,7 +707,7 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in - hd2|hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) + hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 3b39528f4..f9212610d 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1787,7 +1787,7 @@ int CRCInput::translate(int code) case KEY_CHANNELDOWN: return RC_page_down; #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE case KEY_VIDEO: return RC_favorites; case KEY_TV2: diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 557ae892b..4641c012e 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -45,7 +45,7 @@ static bool timer_icon = false; #endif #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_MULTIBOXSE +#if BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE #define DISPLAY_DEV "/dev/null" #else #define DISPLAY_DEV "/dev/dbox/oled0" diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 9090a653f..825df0b63 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -263,7 +263,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { -1, NONEXISTANT_LOCALE, "2160p 50Hz" }, { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } }; -#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL +#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = { { -1, NONEXISTANT_LOCALE, "NTSC" }, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 805f3936e..0a51d34bb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -344,7 +344,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { { CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_yellow, "7,35,freeze", "", "yellow" }, { CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" }, -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE { CRCInput::RC_playpause, "9", "", "5" }, #else { CRCInput::RC_play, "9", "", "5" }, @@ -5797,7 +5797,7 @@ void CNeutrinoApp::loadKeys(const char *fname) g_settings.key_subchannel_down = tconfig->getInt32("key_subchannel_down", CRCInput::RC_left); g_settings.key_subchannel_up = tconfig->getInt32("key_subchannel_up", CRCInput::RC_right); g_settings.key_switchformat = tconfig->getInt32("key_switchformat", CRCInput::RC_nokey); -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS g_settings.key_timeshift = tconfig->getInt32("key_timeshift", CRCInput::RC_nokey); // FIXME #elif BOXMODEL_VUPLUS_ALL g_settings.key_timeshift = tconfig->getInt32("key_timeshift", CRCInput::RC_playpause); @@ -5825,7 +5825,7 @@ void CNeutrinoApp::loadKeys(const char *fname) g_settings.mpkey_forward = tconfig->getInt32("mpkey.forward", CRCInput::RC_forward); g_settings.mpkey_goto = tconfig->getInt32("mpkey.goto", CRCInput::RC_nokey); g_settings.mpkey_next_repeat_mode = tconfig->getInt32("mpkey.next_repeat_mode", CRCInput::RC_nokey); -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE g_settings.mpkey_pause = tconfig->getInt32("mpkey.pause", CRCInput::RC_playpause); g_settings.mpkey_play = tconfig->getInt32("mpkey.play", CRCInput::RC_playpause); #elif BOXMODEL_VUPLUS_ALL diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index bd9b3d25b..dc2e86183 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -915,7 +915,7 @@ unsigned int revert_translate(unsigned int code) case RC_page_down: return KEY_CHANNELDOWN; #ifdef HAVE_ARM_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS case RC_favorites: return KEY_VIDEO; #endif diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index 882de3f80..e63ce0ce4 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -2187,7 +2187,7 @@ int getActivePartition() } fclose(f); } -#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS FILE *f; // first check for subdirboot layout f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");