From cd597acfae004fcc79793a7e8fbbb8a4ed43cd3e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 15 Sep 2022 21:47:31 +0200 Subject: [PATCH] add multibox Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/bf911c308a53eebea767cfad60a4f15dc1b5b330 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 --- Makefile.am | 6 ++++++ acinclude.m4 | 9 ++++++--- common/Makefile.am | 5 +++++ include/ca_hal.h | 1 + include/cs_api.h | 1 + libarmbox/hardware_caps.c | 20 ++++++++++++++++++++ 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6a96117..f8e1d89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,11 @@ SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la else +if BOXMODEL_MULTIBOX +SUBDIRS += libarmbox +libstb_hal_la_LIBADD += \ + libarmbox/libarmbox.la +else if BOXMODEL_MULTIBOXSE SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ @@ -60,6 +65,7 @@ endif endif endif endif +endif SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ libeplayer3/libeplayer3.la diff --git a/acinclude.m4 b/acinclude.m4 index b32fd9d..24df902 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -88,7 +88,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) -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, gb800se, osnino, osninoplus, osninopro]), [case "${withval}" in generic|raspi) @@ -98,7 +98,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, gb800se, osnino, osninoplu 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 @@ -132,6 +132,7 @@ AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") # 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") @@ -179,6 +180,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]) @@ -266,7 +269,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 ;; diff --git a/common/Makefile.am b/common/Makefile.am index 86d8fff..97c176a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -26,6 +26,10 @@ if BOXMODEL_HD60 libcommon_la_SOURCES = \ ca.cpp else +if BOXMODEL_MULTIBOX +libcommon_la_SOURCES = \ + ca.cpp +else if BOXMODEL_MULTIBOXSE libcommon_la_SOURCES = \ ca.cpp @@ -44,6 +48,7 @@ endif endif endif endif +endif else libcommon_la_SOURCES = \ ca.cpp diff --git a/include/ca_hal.h b/include/ca_hal.h index 70d0fe7..3e6fa0a 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -1,6 +1,7 @@ #if HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ && !BOXMODEL_HD60 \ + && !BOXMODEL_MULTIBOX \ && !BOXMODEL_MULTIBOXSE \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ diff --git a/include/cs_api.h b/include/cs_api.h index cd378a1..3c9c070 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -26,6 +26,7 @@ inline void cs_api_exit() #if HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ && !BOXMODEL_HD60 \ + && !BOXMODEL_MULTIBOX \ && !BOXMODEL_MULTIBOXSE \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 7ebcc39..d40d3ef 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -283,6 +283,26 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "HD61"); strcpy(caps.boxarch, "HI3798MV200"); #endif +#if BOXMODEL_MULTIBOX + caps.has_CI = 0; + caps.can_cec = 1; + caps.can_cpufreq = 0; + caps.can_shutdown = 1; + caps.display_xres = 0; + caps.display_type = HW_DISPLAY_NONE; + caps.display_can_umlauts = 0; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 0; + caps.display_has_statusline = 0; + caps.display_has_colon = 0; + 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 4K"); + strcpy(caps.boxarch, "HI3798MV200"); +#endif #if BOXMODEL_MULTIBOXSE caps.has_CI = 0; caps.can_cec = 1;