From 67a7c8f3ef3ef15b2ceefc5377b5469aa2c45139 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 24 Jan 2021 13:09:24 +0100 Subject: [PATCH] =add osmini4k, osnino, osninoplus, osninopro, vuduo2, gb800se --- Makefile.am | 6 +++ acinclude.m4 | 90 ++++++++++++++++++++++----------------- libarmbox/hardware_caps.c | 19 +++++++++ 3 files changed, 77 insertions(+), 38 deletions(-) diff --git a/Makefile.am b/Makefile.am index 194aebb..3ce6965 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,11 @@ SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la else +if BOXMODEL_OSMINI4K +SUBDIRS += libarmbox +libstb_hal_la_LIBADD += \ + libarmbox/libarmbox.la +else if BOXMODEL_OSMIO4K SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ @@ -65,6 +70,7 @@ libstb_hal_la_LIBADD += \ endif endif endif +endif if !ENABLE_GSTREAMER_10 SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ diff --git a/acinclude.m4 b/acinclude.m4 index 0fa62a2..599c5ef 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -89,9 +89,9 @@ AC_ARG_WITH(boxtype, 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, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, hd61, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) -AS_HELP_STRING([], [valid for mipsbox: vuduo]), +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 mipsbox: vuduo, vuduo2, gb800se, osnino, osninoplus, osninopro]), [case "${withval}" in generic|raspi) if test "$BOXTYPE" = "generic"; then @@ -107,21 +107,21 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) + ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|tf7700) if test "$BOXTYPE" = "duckbox"; then BOXMODEL="$withval" else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd60|hd61|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - vuduo) + vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) if test "$BOXTYPE" = "mipsbox"; then BOXMODEL="$withval" else @@ -161,12 +161,6 @@ AM_CONDITIONAL(BOXMODEL_SPARK7162, test "$BOXMODEL" = "spark7162") AM_CONDITIONAL(BOXMODEL_ATEVIO7500, test "$BOXMODEL" = "atevio7500") AM_CONDITIONAL(BOXMODEL_FORTIS_HDBOX, test "$BOXMODEL" = "fortis_hdbox") AM_CONDITIONAL(BOXMODEL_OCTAGON1008, test "$BOXMODEL" = "octagon1008") -AM_CONDITIONAL(BOXMODEL_HS7110, test "$BOXMODEL" = "hs7110") -AM_CONDITIONAL(BOXMODEL_HS7810A, test "$BOXMODEL" = "hs7810a") -AM_CONDITIONAL(BOXMODEL_HS7119, test "$BOXMODEL" = "hs7119") -AM_CONDITIONAL(BOXMODEL_HS7819, test "$BOXMODEL" = "hs7819") -AM_CONDITIONAL(BOXMODEL_DP7000, test "$BOXMODEL" = "dp7000") - AM_CONDITIONAL(BOXMODEL_CUBEREVO, test "$BOXMODEL" = "cuberevo") AM_CONDITIONAL(BOXMODEL_CUBEREVO_MINI, test "$BOXMODEL" = "cuberevo_mini") AM_CONDITIONAL(BOXMODEL_CUBEREVO_MINI2, test "$BOXMODEL" = "cuberevo_mini2") @@ -176,18 +170,20 @@ AM_CONDITIONAL(BOXMODEL_CUBEREVO_3000HD, test "$BOXMODEL" = "cuberevo_3000hd") AM_CONDITIONAL(BOXMODEL_IPBOX9900, test "$BOXMODEL" = "ipbox9900") AM_CONDITIONAL(BOXMODEL_IPBOX99, test "$BOXMODEL" = "ipbox99") AM_CONDITIONAL(BOXMODEL_IPBOX55, test "$BOXMODEL" = "ipbox55") -AM_CONDITIONAL(BOXMODEL_ARIVALINK200, test "$BOXMODEL" = "arivalink200") AM_CONDITIONAL(BOXMODEL_TF7700, test "$BOXMODEL" = "tf7700") -AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") # armbox -AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61") + +AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") + +AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k") AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus") + AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4KSE, test "$BOXMODEL" = "vuduo4kse") @@ -198,6 +194,13 @@ AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") # mipsbox AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") +AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2") + +AM_CONDITIONAL(BOXMODEL_GB800SE, test "$BOXMODEL" = "gb800se") + +AM_CONDITIONAL(BOXMODEL_OSNINO, test "$BOXMODEL" = "osnino") +AM_CONDITIONAL(BOXMODEL_OSNINOPLUS, test "$BOXMODEL" = "osninoplus") +AM_CONDITIONAL(BOXMODEL_OSNINOPRO, test "$BOXMODEL" = "osninopro") if test "$BOXTYPE" = "generic"; then AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) @@ -213,11 +216,19 @@ elif test "$BOXTYPE" = "mipsbox"; then AC_DEFINE(HAVE_MIPS_HARDWARE, 1, [building for an mipsbox]) fi -# TODO: do we need more defines? +# generic if test "$BOXMODEL" = "generic"; then AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) + +# spark +elif test "$BOXMODEL" = "spark"; then + AC_DEFINE(BOXMODEL_SPARK, 1, [spark]) +elif test "$BOXMODEL" = "spark7162"; then + AC_DEFINE(BOXMODEL_SPARK7162, 1, [spark7162]) + +# duckbox elif test "$BOXMODEL" = "ufs910"; then AC_DEFINE(BOXMODEL_UFS910, 1, [ufs910]) elif test "$BOXMODEL" = "ufs912"; then @@ -226,26 +237,12 @@ elif test "$BOXMODEL" = "ufs913"; then AC_DEFINE(BOXMODEL_UFS913, 1, [ufs913]) elif test "$BOXMODEL" = "ufs922"; then AC_DEFINE(BOXMODEL_UFS922, 1, [ufs922]) -elif test "$BOXMODEL" = "spark"; then - AC_DEFINE(BOXMODEL_SPARK, 1, [spark]) -elif test "$BOXMODEL" = "spark7162"; then - AC_DEFINE(BOXMODEL_SPARK7162, 1, [spark7162]) elif test "$BOXMODEL" = "atevio7500"; then AC_DEFINE(BOXMODEL_ATEVIO7500, 1, [atevio7500]) elif test "$BOXMODEL" = "fortis_hdbox"; then AC_DEFINE(BOXMODEL_FORTIS_HDBOX, 1, [fortis_hdbox]) elif test "$BOXMODEL" = "octagon1008"; then AC_DEFINE(BOXMODEL_OCTAGON1008, 1, [octagon1008]) -elif test "$BOXMODEL" = "hs7110"; then - AC_DEFINE(BOXMODEL_HS7110, 1, [hs7110]) -elif test "$BOXMODEL" = "hs7810a"; then - AC_DEFINE(BOXMODEL_HS7810A, 1, [hs7810a]) -elif test "$BOXMODEL" = "hs7119"; then - AC_DEFINE(BOXMODEL_HS7119, 1, [hs7119]) -elif test "$BOXMODEL" = "hs7819"; then - AC_DEFINE(BOXMODEL_HS7819, 1, [hs7819]) -elif test "$BOXMODEL" = "dp7000"; then - AC_DEFINE(BOXMODEL_DP7000, 1, [dp7000]) elif test "$BOXMODEL" = "cuberevo"; then AC_DEFINE(BOXMODEL_CUBEREVO, 1, [cuberevo]) elif test "$BOXMODEL" = "cuberevo_mini"; then @@ -264,26 +261,29 @@ elif test "$BOXMODEL" = "ipbox99"; then AC_DEFINE(BOXMODEL_IPBOX99, 1, [ipbox99]) elif test "$BOXMODEL" = "ipbox55"; then AC_DEFINE(BOXMODEL_IPBOX55, 1, [ipbox55]) -elif test "$BOXMODEL" = "arivalink200"; then - AC_DEFINE(BOXMODEL_ARIVALINK200, 1, [arivalink200]) elif test "$BOXMODEL" = "tf7700"; then AC_DEFINE(BOXMODEL_TF7700, 1, [tf7700]) -elif test "$BOXMODEL" = "hl101"; then - AC_DEFINE(BOXMODEL_HL101, 1, [hl101]) -elif test "$BOXMODEL" = "hd51"; then - AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) + +# armbox 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" = "hd51"; then + AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) 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" = "osmini4k"; then + AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k]) elif test "$BOXMODEL" = "osmio4k"; then AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k]) elif test "$BOXMODEL" = "osmio4kplus"; then AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus]) + elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "vuduo4k"; then @@ -298,13 +298,27 @@ elif test "$BOXMODEL" = "vuuno4kse"; then AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse]) elif test "$BOXMODEL" = "vuzero4k"; then AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) + +# mipsbox elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) +elif test "$BOXMODEL" = "vuduo2"; then + AC_DEFINE(BOXMODEL_VUDUO2, 1, [vuduo2]) + +elif test "$BOXMODEL" = "gb800se"; then + AC_DEFINE(BOXMODEL_GB800SE, 1, [gb800se]) + +elif test "$BOXMODEL" = "osnino"; then + AC_DEFINE(BOXMODEL_OSNINO, 1, [osnino]) +elif test "$BOXMODEL" = "osninoplus"; then + AC_DEFINE(BOXMODEL_OSNINOPLUS, 1, [osninoplus]) +elif test "$BOXMODEL" = "osninopro"; then + AC_DEFINE(BOXMODEL_OSNINOPRO, 1, [osninopro]) fi # all vuplus BOXMODELs case "$BOXMODEL" in - vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) + vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2) AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all]) vuplus_all=true ;; @@ -328,7 +342,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true") # all vuplus mips BOXMODELs case "$BOXMODEL" in - vuduo) + vuduo|vuduo2) AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips]) vuplus_mips=true ;; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index f86766c..bd5f8a8 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -267,6 +267,25 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "Zgemma H7C/S"); strcpy(caps.boxarch, "BCM7251S"); #endif +#if BOXMODEL_OSMINI4K + 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_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 1; + caps.display_has_colon = 1; + caps.has_button_timer = 1; + caps.has_button_vformat = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "Edision"); + strcpy(caps.boxname, "OS mini 4K"); + strcpy(caps.boxarch, "BCM72604"); +#endif #if BOXMODEL_OSMIO4K initialized = 1; caps.has_CI = 0;