From 3ceda85a39dd8026065da54ee65bd22146e04472 Mon Sep 17 00:00:00 2001 From: max_10 Date: Tue, 27 Jan 2015 22:16:56 +0100 Subject: [PATCH] add cuberevo mini/250hd Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/f2ac0106f204169155d14ce4d20e025fe90f4fda Author: max_10 Date: 2015-01-27 (Tue, 27 Jan 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 10 ++++++++-- libduckbox/hardware_caps.c | 22 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ac140fe..eecfd99 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -330,7 +330,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, [ --with-boxmodel valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025 valid for ipbox: ip200, ip250, ip350, ip400 - valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini2, cuberevo_2000hd, tf7700], + 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, tf7700], [case "${withval}" in dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025) if test "$BOXTYPE" = "dreambox"; then @@ -346,7 +346,7 @@ AC_ARG_WITH(boxmodel, 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_mini2|cuberevo_2000hd|tf7700) + ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|tf7700) if test "$BOXTYPE" = "duckbox"; then BOXMODEL="$withval" else @@ -409,7 +409,9 @@ 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") +AM_CONDITIONAL(BOXMODEL_CUBEREVO_250HD,test "$BOXMODEL" = "cuberevo_250hd") AM_CONDITIONAL(BOXMODEL_CUBEREVO_2000HD,test "$BOXMODEL" = "cuberevo_2000hd") AM_CONDITIONAL(BOXMODEL_TF7700,test "$BOXMODEL" = "tf7700") @@ -475,8 +477,12 @@ 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 + AC_DEFINE(BOXMODEL_CUBEREVO_MINI, 1, [cuberevo_mini]) elif test "$BOXMODEL" = "cuberevo_mini2"; then AC_DEFINE(BOXMODEL_CUBEREVO_MINI2, 1, [cuberevo_mini2]) +elif test "$BOXMODEL" = "cuberevo_250hd"; then + AC_DEFINE(BOXMODEL_CUBEREVO_250HD, 1, [cuberevo_250hd]) elif test "$BOXMODEL" = "cuberevo_2000hd"; then AC_DEFINE(BOXMODEL_CUBEREVO_2000HD, 1, [cuberevo_2000hd]) elif test "$BOXMODEL" = "tf7700"; then diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index ca16127..bd8e511 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -151,6 +151,16 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; } else if (!strncmp(buf, "cuberevo", 8)) { + strcpy(caps.boxvendor, "DUCKBOX"); + strcpy(caps.boxname, buf); + caps.can_shutdown = 1; + caps.has_HDMI = 1; + caps.has_SCART = 1; + caps.can_cec = 0; + caps.has_fan = 1; + caps.has_CI = 2; + } + else if (!strncmp(buf, "cuberevo-mini", 14)) { strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, buf); caps.can_shutdown = 1; @@ -167,9 +177,19 @@ hw_caps_t *get_hwcaps(void) caps.has_HDMI = 1; caps.has_SCART = 1; caps.can_cec = 0; - caps.has_fan = 0; + caps.has_fan = 1; caps.has_CI = 2; } + else if (!strncmp(buf, "cuberevo-250hd", 4)) { + strcpy(caps.boxvendor, "DUCKBOX"); + strcpy(caps.boxname, buf); + caps.can_shutdown = 1; + caps.has_HDMI = 1; + caps.has_SCART = 1; + caps.can_cec = 0; + caps.has_fan = 1; + caps.has_CI = 0; + } else if (!strncmp(buf, "cuberevo-2000hd", 15)) { strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, buf);