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");