From d100d531be6d99217c1471c553f4ffaeb440f03c Mon Sep 17 00:00:00 2001 From: max_10 Date: Mon, 17 Feb 2020 21:21:47 +0100 Subject: [PATCH] add osmio4k / osmio4kplus not yet ready Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f00b047142e9266f1b38371aa0c9e5f906795819 Author: max_10 Date: 2020-02-17 (Mon, 17 Feb 2020) Origin message was: ------------------ - add osmio4k / osmio4kplus not yet ready ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 9 ++++++--- data/y-web/images/Makefile.am | 4 ++++ src/driver/rcinput.cpp | 2 +- src/neutrino.cpp | 6 +++--- src/nhttpd/tuxboxapi/controlapi.cpp | 2 +- src/system/helpers.cpp | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0f9e344d1..06dd43c19 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -447,7 +447,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: hd51, hd60, bre2ze4k, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k, osmioplus4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in generic|raspi) @@ -476,7 +476,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|osmioplus4k) + hd51|hd60|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -520,6 +520,7 @@ AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") +AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") AM_CONDITIONAL(BOXMODEL_OSMIOPLUS4K, test "$BOXMODEL" = "osmioplus4k") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") @@ -576,6 +577,8 @@ elif test "$BOXMODEL" = "bre2ze4k"; then AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) elif test "$BOXMODEL" = "h7"; then AC_DEFINE(BOXMODEL_H7, 1, [h7]) +elif test "$BOXMODEL" = "osmio4k"; then + AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k]) elif test "$BOXMODEL" = "osmioplus4k"; then AC_DEFINE(BOXMODEL_OSMIOPLUS4K, 1, [osmioplus4k]) elif test "$BOXMODEL" = "vusolo4k"; then @@ -620,7 +623,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in - hd2|hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|osmioplus4k) + hd2|hd51|hd60|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index fb5891320..c2f96bbf9 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -104,6 +104,10 @@ if BOXMODEL_H7 install_DATA += rc_zgemma_h7.png endif +if BOXMODEL_OSMIO4K +install_DATA += rc_osmio4k.png +endif + if BOXMODEL_OSMIOPLUS4K install_DATA += rc_osmio4k.png endif diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index a342a7024..7be5f1fa6 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1752,7 +1752,7 @@ int CRCInput::translate(int code) case KEY_CHANNELDOWN: return RC_page_down; #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K case KEY_VIDEO: return RC_favorites; #endif diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 60477bc55..e488a1e90 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -317,7 +317,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { { CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_yellow, "7,35", "", "yellow" }, { CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" }, -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K { CRCInput::RC_playpause, "9", "", "5" }, #else { CRCInput::RC_play, "9", "", "5" }, @@ -5404,7 +5404,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_list_start = tconfig->getInt32( "key_list_start", (unsigned int)CRCInput::RC_nokey ); g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey ); -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME #elif BOXMODEL_VUPLUS g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); @@ -5439,7 +5439,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.mpkey_rewind = tconfig->getInt32( "mpkey.rewind", CRCInput::RC_rewind ); g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward ); g_settings.mpkey_stop = tconfig->getInt32( "mpkey.stop", CRCInput::RC_stop ); -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #elif BOXMODEL_VUPLUS diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index d49bf2af7..93e337870 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -905,7 +905,7 @@ unsigned int revert_translate(unsigned int code) case RC_page_down: return KEY_CHANNELDOWN; #ifdef HAVE_ARM_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K case RC_favorites: return KEY_VIDEO; #endif diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index f645ccfe5..a71891da6 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -2064,7 +2064,7 @@ int getActivePartition() } fclose(f); } -#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIOPLUS4K +#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIOPLUS4K FILE *f; // first check for subdirboot layout f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");