From 424a771a1c6d279fa7030071bb7867f1289a4047 Mon Sep 17 00:00:00 2001 From: max_10 Date: Wed, 23 Oct 2019 23:22:37 +0200 Subject: [PATCH] add h7 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/57289f972b25f3bceb2c99d02741bb82ccd685ed Author: max_10 Date: 2019-10-23 (Wed, 23 Oct 2019) Origin message was: ------------------ - add h7 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 12 ++++++++++-- libarmbox/hardware_caps.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4802a9c..dc1547d 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, 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, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k, h7]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in generic|raspi) @@ -114,7 +114,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|h7) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -149,6 +149,11 @@ AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox") AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") +# spark +AM_CONDITIONAL(BOXMODEL_SPARK, test "$BOXMODEL" = "spark") +AM_CONDITIONAL(BOXMODEL_SPARK7162, test "$BOXMODEL" = "spark7162") + +# duckbox AM_CONDITIONAL(BOXMODEL_UFS910, test "$BOXMODEL" = "ufs910") AM_CONDITIONAL(BOXMODEL_UFS912, test "$BOXMODEL" = "ufs912") AM_CONDITIONAL(BOXMODEL_UFS913, test "$BOXMODEL" = "ufs913") @@ -187,6 +192,7 @@ AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k") AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k") AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse") AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") +AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") # mipsbox AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") @@ -284,6 +290,8 @@ elif test "$BOXMODEL" = "vuuno4kse"; then AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse]) elif test "$BOXMODEL" = "vuzero4k"; then AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) +elif test "$BOXMODEL" = "h7"; then + AC_DEFINE(BOXMODEL_H7, 1, [h7]) elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) fi diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index c78a8e7..95cb76d 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -183,6 +183,23 @@ hw_caps_t *get_hwcaps(void) 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_shutdown = 1; + caps.display_xres = 5; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_button_vformat = 0; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "AirDigital"); + strcpy(caps.boxname, "Zgemma H7C/S"); + strcpy(caps.boxarch, "BCM7251S"); #endif return ∩︀ }