From 2f1758addc0e060eaed82c9ecb37bb9cd5ccccbc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 28 May 2021 23:18:09 +0200 Subject: [PATCH 1/6] add Maxytec Multibox SE 4K Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/29996242d680a17911c6771235ad90494f4e01bc Author: vanhofen Date: 2021-05-28 (Fri, 28 May 2021) Origin message was: ------------------ - add Maxytec Multibox SE 4K ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 6 ++++++ acinclude.m4 | 9 ++++++--- common/Makefile.am | 5 +++++ include/ca_hal.h | 1 + include/cs_api.h | 1 + libarmbox/hardware_caps.c | 22 ++++++++++++++++++++++ 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3ce6965..69ed515 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,11 @@ SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la else +if BOXMODEL_MULTIBOXSE +SUBDIRS += libarmbox +libstb_hal_la_LIBADD += \ + libarmbox/libarmbox.la +else if BOXMODEL_OSMINI4K SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ @@ -71,6 +76,7 @@ endif endif endif endif +endif if !ENABLE_GSTREAMER_10 SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ diff --git a/acinclude.m4 b/acinclude.m4 index 599c5ef..014c249 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -90,7 +90,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700]) -AS_HELP_STRING([], [valid for armbox: hd60, hd61, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +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 mipsbox: vuduo, vuduo2, gb800se, osnino, osninoplus, osninopro]), [case "${withval}" in generic|raspi) @@ -114,7 +114,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, gb800se, osnino, osninoplu AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd60|hd61|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -175,6 +175,7 @@ AM_CONDITIONAL(BOXMODEL_TF7700, test "$BOXMODEL" = "tf7700") # armbox AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61") +AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") @@ -269,6 +270,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" = "multiboxse"; then + AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse]) elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) @@ -354,7 +357,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true") # all hisilicon BOXMODELs case "$BOXMODEL" in - hd60|hd61) + hd60|hd61|multiboxse) AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon]) hisilicon=true ;; diff --git a/common/Makefile.am b/common/Makefile.am index e847a54..af1dac9 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -35,6 +35,10 @@ if BOXMODEL_HD60 libcommon_la_SOURCES = \ ca.cpp else +if BOXMODEL_MULTIBOXSE +libcommon_la_SOURCES = \ + ca.cpp +else if BOXMODEL_OSMIO4K libcommon_la_SOURCES = \ ca.cpp @@ -48,6 +52,7 @@ libcommon_la_SOURCES = \ endif endif endif +endif else libcommon_la_SOURCES = \ ca.cpp diff --git a/include/ca_hal.h b/include/ca_hal.h index 71217e6..a2f124d 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -2,6 +2,7 @@ || HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ && !BOXMODEL_HD60 \ + && !BOXMODEL_MULTIBOXSE \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ ) diff --git a/include/cs_api.h b/include/cs_api.h index 1336743..89836f4 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -27,6 +27,7 @@ inline void cs_api_exit() || HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ && !BOXMODEL_HD60 \ + && !BOXMODEL_MULTIBOXSE \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ ) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 64b08e1..99b1b48 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -243,6 +243,27 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "HD61"); strcpy(caps.boxarch, "HI3798M"); #endif +#if BOXMODEL_MULTIBOXSE + initialized = 1; + caps.has_CI = 0; + caps.can_cec = 1; + caps.can_cpufreq = 0; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_ONLY; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_can_umlauts = 0; + caps.display_has_statusline = 0; + caps.display_has_colon = 1; + caps.has_button_timer = 1; + caps.has_button_vformat = 0; + caps.has_HDMI = 1; + strcpy(caps.startup_file, "STARTUP_LINUX"); + strcpy(caps.boxvendor, "Maxytec"); + strcpy(caps.boxname, "Multibox SE 4K"); + strcpy(caps.boxarch, "HI3798M"); +#endif #if BOXMODEL_BRE2ZE4K initialized = 1; caps.has_CI = 1; @@ -301,6 +322,7 @@ hw_caps_t *get_hwcaps(void) caps.has_button_timer = 1; caps.has_button_vformat = 1; caps.has_HDMI = 1; + strcpy(caps.startup_file, "STARTUP"); strcpy(caps.boxvendor, "Edision"); strcpy(caps.boxname, "OS mini 4K"); strcpy(caps.boxarch, "BCM72604"); From ce566eacc5a06a8dfcb79c796039fa93bdc1df8e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 28 May 2021 23:18:09 +0200 Subject: [PATCH 2/6] armbox/hwcaps: resort Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e044314e3cf4b3eaa3d2f02ae0db83f3b44ab39f Author: vanhofen Date: 2021-05-28 (Fri, 28 May 2021) Origin message was: ------------------ - armbox/hwcaps: resort ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hardware_caps.c | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 99b1b48..4b85b4a 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -203,6 +203,48 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "HD51"); strcpy(caps.boxarch, "BCM7251S"); #endif +#if BOXMODEL_BRE2ZE4K + initialized = 1; + caps.has_CI = 1; + caps.can_cec = 1; + caps.can_cpufreq = 0; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_can_umlauts = 0; + caps.display_has_statusline = 0; + caps.display_has_colon = 1; + caps.has_button_timer = 1; + caps.has_button_vformat = 1; + caps.has_HDMI = 1; + strcpy(caps.startup_file, "STARTUP"); + strcpy(caps.boxvendor, "WWIO"); + strcpy(caps.boxname, "BRE2ZE4K"); + strcpy(caps.boxarch, "BCM7251S"); +#endif +#if BOXMODEL_H7 + initialized = 1; + caps.has_CI = 1; + caps.can_cec = 1; + caps.can_cpufreq = 0; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_can_umlauts = 0; + caps.display_has_statusline = 0; + caps.display_has_colon = 1; + caps.has_button_timer = 1; + caps.has_button_vformat = 0; + caps.has_HDMI = 1; + strcpy(caps.startup_file, "STARTUP"); + strcpy(caps.boxvendor, "AirDigital"); + strcpy(caps.boxname, "Zgemma H7"); + strcpy(caps.boxarch, "BCM7251S"); +#endif #if BOXMODEL_HD60 initialized = 1; caps.has_CI = 0; @@ -264,48 +306,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "Multibox SE 4K"); strcpy(caps.boxarch, "HI3798M"); #endif -#if BOXMODEL_BRE2ZE4K - initialized = 1; - caps.has_CI = 1; - caps.can_cec = 1; - caps.can_cpufreq = 0; - caps.can_shutdown = 1; - caps.display_xres = 4; - caps.display_type = HW_DISPLAY_LED_NUM; - caps.display_can_deepstandby = 0; - caps.display_can_set_brightness = 1; - caps.display_can_umlauts = 0; - caps.display_has_statusline = 0; - caps.display_has_colon = 1; - caps.has_button_timer = 1; - caps.has_button_vformat = 1; - caps.has_HDMI = 1; - strcpy(caps.startup_file, "STARTUP"); - strcpy(caps.boxvendor, "WWIO"); - strcpy(caps.boxname, "BRE2ZE4K"); - strcpy(caps.boxarch, "BCM7251S"); -#endif -#if BOXMODEL_H7 - initialized = 1; - caps.has_CI = 1; - caps.can_cec = 1; - caps.can_cpufreq = 0; - caps.can_shutdown = 1; - caps.display_xres = 4; - caps.display_type = HW_DISPLAY_LED_NUM; - caps.display_can_deepstandby = 0; - caps.display_can_set_brightness = 1; - caps.display_can_umlauts = 0; - caps.display_has_statusline = 0; - caps.display_has_colon = 1; - caps.has_button_timer = 1; - caps.has_button_vformat = 0; - caps.has_HDMI = 1; - strcpy(caps.startup_file, "STARTUP"); - strcpy(caps.boxvendor, "AirDigital"); - strcpy(caps.boxname, "Zgemma H7"); - strcpy(caps.boxarch, "BCM7251S"); -#endif #if BOXMODEL_OSMINI4K initialized = 1; caps.has_CI = 0; From 1821e2143ce25c68acd1dbb23700990c114324ce Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 29 May 2021 20:49:47 +0200 Subject: [PATCH 3/6] introduce can_pip Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/f198d198785f198797560757a221e0e53255e981 Author: TangoCash Date: 2021-05-29 (Sat, 29 May 2021) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/hardware_caps.h | 1 + libarmbox/hardware_caps.c | 3 +++ libduckbox/hardware_caps.c | 3 +++ libgeneric-pc/hardware_caps.c | 3 +++ libmipsbox/hardware_caps.c | 3 +++ libspark/hardware_caps.c | 3 +++ 6 files changed, 16 insertions(+) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 50144db..0492e83 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -30,6 +30,7 @@ typedef struct hw_caps int has_SCART; int has_SCART_input; int has_YUV_cinch; + int can_pip; int can_cpufreq; int can_shutdown; int can_cec; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 4b85b4a..a4e2bdb 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -29,6 +29,9 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + #if BOXMODEL_VUSOLO4K initialized = 1; caps.has_CI = 1; diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 733e60c..e97ccb9 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -26,6 +26,9 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + #if BOXMODEL_UFS910 initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index 999e011..824f28d 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -27,6 +27,9 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + initialized = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index 14917fd..914c9a1 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -29,6 +29,9 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + #if BOXMODEL_VUDUO initialized = 1; caps.has_CI = 2; diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index fd0497b..41a52dc 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -29,6 +29,9 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + initialized = 1; caps.has_CI = 0; caps.can_cec = 1; From e7578702e08e8f3507e62ecd90a326c697ddb0a7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 29 May 2021 20:49:47 +0200 Subject: [PATCH 4/6] addition to introduce can_pip Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b6ca55fb3d6484a0b5438474ca8fb50e79e34ed7 Author: vanhofen Date: 2021-05-29 (Sat, 29 May 2021) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hardware_caps.c | 2 ++ libduckbox/hardware_caps.c | 2 ++ libgeneric-pc/hardware_caps.c | 2 ++ libmipsbox/hardware_caps.c | 2 ++ libraspi/hardware_caps.c | 5 +++++ libspark/hardware_caps.c | 2 ++ 6 files changed, 15 insertions(+) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index a4e2bdb..88b3278 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -31,6 +31,8 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; + else + caps.can_pip = 0; #if BOXMODEL_VUSOLO4K initialized = 1; diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index e97ccb9..3b1df34 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -28,6 +28,8 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; + else + caps.can_pip = 0; #if BOXMODEL_UFS910 initialized = 1; diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index 824f28d..17f8587 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -29,6 +29,8 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; + else + caps.can_pip = 0; initialized = 1; caps.can_cpufreq = 0; diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index 914c9a1..af8f3a6 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -31,6 +31,8 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; + else + caps.can_pip = 0; #if BOXMODEL_VUDUO initialized = 1; diff --git a/libraspi/hardware_caps.c b/libraspi/hardware_caps.c index 69d5be3..4b59d38 100644 --- a/libraspi/hardware_caps.c +++ b/libraspi/hardware_caps.c @@ -25,6 +25,11 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); + if (access("/dev/dvb/adapter0/video1", F_OK) != -1) + caps.can_pip = 1; + else + caps.can_pip = 0; + initialized = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 41a52dc..eefa7b1 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -31,6 +31,8 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; + else + caps.can_pip = 0; initialized = 1; caps.has_CI = 0; From cef23d5de4361bf4811f00c03e8f0041ba1efa54 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 29 May 2021 20:49:47 +0200 Subject: [PATCH 5/6] hw_caps: simplify and unify initialized handling Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5ec4e4f22f1c503ded36afee66e995060bfe96c8 Author: vanhofen Date: 2021-05-29 (Sat, 29 May 2021) Origin message was: ------------------ - hw_caps: simplify and unify initialized handling ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hardware_caps.c | 18 ++---------------- libduckbox/hardware_caps.c | 19 ++----------------- libgeneric-pc/hardware_caps.c | 2 +- libmipsbox/hardware_caps.c | 3 ++- libraspi/hardware_caps.c | 2 +- libspark/hardware_caps.c | 3 ++- 6 files changed, 10 insertions(+), 37 deletions(-) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 88b3278..6c31ba2 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -35,7 +35,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 0; #if BOXMODEL_VUSOLO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -57,7 +56,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7376"); #endif #if BOXMODEL_VUDUO4K - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -80,7 +78,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7278"); #endif #if BOXMODEL_VUDUO4KSE - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_shutdown = 1; @@ -102,7 +99,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7444S"); #endif #if BOXMODEL_VUULTIMO4K - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -125,7 +121,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7444S"); #endif #if BOXMODEL_VUZERO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -145,7 +140,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_VUUNO4KSE - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -168,7 +162,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7252S"); #endif #if BOXMODEL_VUUNO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -188,7 +181,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7252S"); #endif #if BOXMODEL_HD51 - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -209,7 +201,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_BRE2ZE4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -230,7 +221,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_H7 - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -251,7 +241,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_HD60 - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -272,7 +261,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_HD61 - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_shutdown = 1; @@ -291,7 +279,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_MULTIBOXSE - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -312,7 +299,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_OSMINI4K - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -333,7 +319,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_OSMIO4K - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -354,7 +339,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_OSMIO4KPLUS - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -375,5 +359,7 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "OS mio+ 4K"); strcpy(caps.boxarch, "BCM72604"); #endif + + initialized = 1; return ∩︀ } diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 3b1df34..3f5af84 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -32,7 +32,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 0; #if BOXMODEL_UFS910 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS910"); strcpy(caps.boxarch, "STX7100"); @@ -50,7 +49,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS912 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS912"); strcpy(caps.boxarch, "STX7111"); @@ -68,7 +66,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS913 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS913"); strcpy(caps.boxarch, "STX7105"); @@ -86,7 +83,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS922 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS922"); strcpy(caps.boxarch, "STX7109"); @@ -103,7 +99,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_ATEVIO7500 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "ATEVIO7500"); strcpy(caps.boxarch, "STX7105"); @@ -121,7 +116,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 12; #endif #if BOXMODEL_FORTIS_HDBOX - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "HDBOX"); strcpy(caps.boxarch, "STX7109"); @@ -139,7 +133,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 12; #endif #if BOXMODEL_OCTAGON1008 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "OCTAGON1008"); strcpy(caps.boxarch, "STX7109"); @@ -156,7 +149,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 8; #endif #if BOXMODEL_CUBEREVO - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO"); strcpy(caps.boxarch, "STX7109"); @@ -171,7 +163,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_CUBEREVO_MINI - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-MINI"); strcpy(caps.boxarch, "STX7109"); @@ -186,7 +177,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_CUBEREVO_MINI2 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-MINI2"); strcpy(caps.boxarch, "STX7109"); @@ -203,7 +193,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 14; #endif #if BOXMODEL_CUBEREVO_250HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-250HD"); strcpy(caps.boxarch, "STX7109"); @@ -218,7 +207,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_CUBEREVO_2000HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-2000HD"); strcpy(caps.boxarch, "STX7109"); @@ -233,7 +221,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_CUBEREVO_3000HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-3000HD"); strcpy(caps.boxarch, "STX7109"); @@ -248,7 +235,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_IPBOX9900 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX9900"); strcpy(caps.boxarch, "STX7109"); @@ -263,7 +249,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_IPBOX99 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX99"); strcpy(caps.boxarch, "STX7109"); @@ -278,7 +263,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_IPBOX55 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX55"); strcpy(caps.boxarch, "STX7109"); @@ -293,7 +277,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_TF7700 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "TF7700"); strcpy(caps.boxarch, "STX7109"); @@ -307,5 +290,7 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 2; #endif + + initialized = 1; return ∩︀ } diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index 17f8587..08b8af8 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -32,7 +32,6 @@ hw_caps_t *get_hwcaps(void) else caps.can_pip = 0; - initialized = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ caps.display_type = HW_DISPLAY_LINE_TEXT; @@ -53,5 +52,6 @@ hw_caps_t *get_hwcaps(void) else fprintf(stderr, "%s: uname() failed: %m\n", __func__); + initialized = 1; return ∩︀ } diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index af8f3a6..81d16c5 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -35,7 +35,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 0; #if BOXMODEL_VUDUO - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -56,5 +55,7 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "DUO"); strcpy(caps.boxarch, "BCM7335"); #endif + + initialized = 1; return ∩︀ } diff --git a/libraspi/hardware_caps.c b/libraspi/hardware_caps.c index 4b59d38..fa120d3 100644 --- a/libraspi/hardware_caps.c +++ b/libraspi/hardware_caps.c @@ -30,7 +30,6 @@ hw_caps_t *get_hwcaps(void) else caps.can_pip = 0; - initialized = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ caps.display_type = HW_DISPLAY_LINE_TEXT; @@ -42,5 +41,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "Raspberry"); strcpy(caps.boxname, "Pi"); + initialized = 1; return ∩︀ } diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index eefa7b1..8af7bca 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -34,7 +34,6 @@ hw_caps_t *get_hwcaps(void) else caps.can_pip = 0; - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 1; @@ -178,5 +177,7 @@ hw_caps_t *get_hwcaps(void) tmp = "(NO STB_ID FOUND)"; strcpy(caps.boxname, tmp); } + + initialized = 1; return ∩︀ } From b39fa257a3e6e63519d9b45d7b7db8e468ca2ad5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 29 May 2021 21:18:51 +0200 Subject: [PATCH 6/6] Revert "addition to introduce can_pip" This reverts commit e7578702e08e8f3507e62ecd90a326c697ddb0a7. Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9ee993a1004124c1bd6937cec723399d154d8928 Author: vanhofen Date: 2021-05-29 (Sat, 29 May 2021) ------------------ This commit was generated by Migit --- libarmbox/hardware_caps.c | 2 -- libduckbox/hardware_caps.c | 2 -- libgeneric-pc/hardware_caps.c | 2 -- libmipsbox/hardware_caps.c | 2 -- libraspi/hardware_caps.c | 2 -- libspark/hardware_caps.c | 2 -- 6 files changed, 12 deletions(-) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 6c31ba2..46354b9 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -31,8 +31,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; #if BOXMODEL_VUSOLO4K caps.has_CI = 1; diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 3f5af84..6a2cb1b 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -28,8 +28,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; #if BOXMODEL_UFS910 strcpy(caps.boxvendor, "KATHREIN"); diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index 08b8af8..5b5afa3 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -29,8 +29,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index 81d16c5..422b159 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -31,8 +31,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; #if BOXMODEL_VUDUO caps.has_CI = 2; diff --git a/libraspi/hardware_caps.c b/libraspi/hardware_caps.c index fa120d3..6b9009a 100644 --- a/libraspi/hardware_caps.c +++ b/libraspi/hardware_caps.c @@ -27,8 +27,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 8af7bca..8500d47 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -31,8 +31,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - else - caps.can_pip = 0; caps.has_CI = 0; caps.can_cec = 1;