From 515477b870a85cc99397318a1079a79dcbdaedf0 Mon Sep 17 00:00:00 2001 From: zukon Date: Wed, 11 Mar 2015 11:45:42 +0100 Subject: [PATCH] add ipbox 9900, 99, 55 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/808354b31e3abdf3d254159cb2574ead0b124757 Author: zukon Date: 2015-03-11 (Wed, 11 Mar 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 17 ++++++++++-- include/cs_frontpanel.h | 57 ++++++++++++++++++++++++++++++++++++++ libduckbox/hardware_caps.c | 30 ++++++++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index eecfd99..642bbf9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -319,6 +319,10 @@ AC_ARG_WITH(boxtype, BOXTYPE="duckbox" BOXMODEL="$withval" ;; + ipbox*) + BOXTYPE="duckbox" + BOXMODEL="$withval" + ;; tf*) BOXTYPE="duckbox" BOXMODEL="$withval" @@ -330,7 +334,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_mini, cuberevo_mini2, cuberevo_250hd, 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, ipbox9900, ipbox99, ipbox55, tf7700], [case "${withval}" in dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025) if test "$BOXTYPE" = "dreambox"; then @@ -346,7 +350,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_mini|cuberevo_mini2|cuberevo_250hd|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|ipbox9900|ipbox99|ipbox55|tf7700) if test "$BOXTYPE" = "duckbox"; then BOXMODEL="$withval" else @@ -413,6 +417,9 @@ 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_IPBOX9900,test "$BOXMODEL" = "ipbox9900") +AM_CONDITIONAL(BOXMODEL_IPBOX99,test "$BOXMODEL" = "ipbox99") +AM_CONDITIONAL(BOXMODEL_IPBOX55,test "$BOXMODEL" = "ipbox55") AM_CONDITIONAL(BOXMODEL_TF7700,test "$BOXMODEL" = "tf7700") @@ -485,6 +492,12 @@ 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" = "ipbox9900"; then + AC_DEFINE(BOXMODEL_IPBOX9900, 1, [ipbox9900]) +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" = "tf7700"; then AC_DEFINE(BOXMODEL_TF7700, 1, [tf7700]) elif test "$BOXMODEL" = "raspi"; then diff --git a/include/cs_frontpanel.h b/include/cs_frontpanel.h index 8fe6044..ce35f11 100644 --- a/include/cs_frontpanel.h +++ b/include/cs_frontpanel.h @@ -162,6 +162,63 @@ typedef enum { FP_ICON_RECORD = FP_ICON_REC, FP_ICON_DOWNLOAD = 0, FP_ICON_TIMESHIFT = 0 +#elif defined(BOXMODEL_IPBOX9900) || defined(BOXMODEL_IPBOX99) + ICON_STANDBY, + ICON_SAT, + ICON_REC, + ICON_TIMESHIFT, + ICON_TIMER, + ICON_HD, + ICON_SCRAMBLED, + ICON_MUTE, + ICON_TUNER1, + ICON_TUNER2, + ICON_MP3, + ICON_REPEAT, + ICON_PLAY, + ICON_PAUSE, + ICON_TER, + ICON_FILE, + ICON_480I, + ICON_480P, + ICON_576I, + ICON_576P, + ICON_720P, + ICON_1080I, + ICON_1080P, + ICON_TV, + ICON_RADIO, + ICON_MAX, + FP_ICON_480P = ICON_480P, + FP_ICON_480I = ICON_480I, + FP_ICON_576P = ICON_576P, + FP_ICON_576I = ICON_576I, + FP_ICON_PLAY = ICON_PLAY, + FP_ICON_PAUSE = ICON_PAUSE, + FP_ICON_1080P = 0x0A, + FP_ICON_1080I = 0x09, + FP_ICON_720P = 0x08, + FP_ICON_POWER = 0x00, + FP_ICON_HD = 0x05, + FP_ICON_RADIO = 0x0D, + FP_ICON_MP3 = FP_ICON_RADIO, + FP_ICON_MUSIC = FP_ICON_RADIO, + FP_ICON_DD = 0x04, + FP_ICON_REC = 0x03, + FP_ICON_FF = 0, + FP_ICON_FR = 0, + FP_ICON_USB = 0, + FP_ICON_HDD = 0, + FP_ICON_MUTE = 0, + FP_ICON_CLOCK = 0, + FP_ICON_CAM1 = 0, + FP_ICON_LOCK = 0, + FP_ICON_DOWNLOAD = 0, + FP_ICON_TIMESHIFT = FP_ICON_REC, + FP_ICON_TV = 0, + FP_ICON_MAIL = 0, + FP_ICON_BT = 0, + #else FP_ICON_USB = 0x10, FP_ICON_HD, diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index bd8e511..adf4775 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -200,6 +200,36 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 0; } + else if (!strncmp(buf, "ipbox9900", 9)) { + strcpy(caps.boxvendor, "DUCKBOX"); + strcpy(caps.boxname, buf); + caps.can_shutdown = 1; + caps.has_HDMI = 1; + caps.has_SCART = 2; + caps.can_cec = 0; + caps.has_fan = 1; + caps.has_CI = 2; + } + else if (!strncmp(buf, "ipbox99", 7)) { + 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, "ipbox55", 7)) { + 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 = 0; + caps.has_CI = 0; + } else if (!strncmp(buf, "tf7700", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, buf);