From a7956044c7a31ed11f7d1d40f66eed2b34a3578a Mon Sep 17 00:00:00 2001 From: max_10 Date: Sun, 25 Aug 2019 22:17:54 +0200 Subject: [PATCH] vuzero4k added Conflicts: configure.ac Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/f3a7113f6ee64cfc6c2c7c77e8b715d40fb60bf5 Author: max_10 Date: 2019-08-25 (Sun, 25 Aug 2019) Origin message was: ------------------ - vuzero4k added Conflicts: configure.ac ------------------ This commit was generated by Migit --- acinclude.m4 | 13 ++++++++----- libarmbox/hardware_caps.c | 22 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8edb8f3..5647cda 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -90,7 +90,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi]) 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 spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in 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) @@ -107,7 +107,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|vusolo4k|bre2ze4k) + hd51|hd60|bre2ze4k|vusolo4k|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -174,8 +174,9 @@ AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") -AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") +AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") +AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") @@ -255,10 +256,12 @@ elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) elif test "$BOXMODEL" = "hd60"; then AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) -elif test "$BOXMODEL" = "vusolo4k"; then - AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "bre2ze4k"; then AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) +elif test "$BOXMODEL" = "vusolo4k"; then + AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) +elif test "$BOXMODEL" = "vuzero4k"; then + AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) elif test "$BOXMODEL" = "raspi"; then diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 971f286..4610320 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -37,9 +37,9 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 480; caps.display_yres = 320; caps.display_type = HW_DISPLAY_GFX; - caps.display_can_deepstandby = 1; - caps.display_can_set_brightness = 1; - caps.display_has_statusline = 1; + caps.display_can_deepstandby = 0; // 0 because we use graphlcd/lcd4linux + caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux + caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -47,6 +47,22 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "SOLO4K"); strcpy(caps.boxarch, "BCM7376"); #endif +#if BOXMODEL_VUZERO4K + initialized = 1; + caps.has_CI = 1; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_type = HW_DISPLAY_NONE; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 0; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_button_vformat = 0; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "VU+"); + strcpy(caps.boxname, "ZERO4K"); + strcpy(caps.boxarch, "BCM72604"); +#endif #if BOXMODEL_HD51 initialized = 1; caps.has_CI = 1;