From 473425929e5fc4879a6161b7d92f7329700df501 Mon Sep 17 00:00:00 2001 From: max_10 Date: Thu, 26 Sep 2019 15:47:43 +0200 Subject: [PATCH] add osmio4k / osmio4kplus not yet ready Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0df05330fa53478fabb034482d1901ad1cb53b9d Author: max_10 Date: 2019-09-26 (Thu, 26 Sep 2019) Origin message was: ------------------ - add osmio4k / osmio4kplus not yet ready ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 14 +++++++++++++- acinclude.m4 | 10 ++++++++-- common/Makefile.am | 10 ++++++++++ include/ca_hal.h | 8 +++++++- include/cs_api.h | 8 +++++++- libarmbox/hardware_caps.c | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 79 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3519962..50576c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,18 +59,30 @@ SUBDIRS += libarmbox libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la else +if BOXMODEL_OSMIO4K +SUBDIRS += libarmbox +libstb_hal_la_LIBADD += \ + libarmbox/libarmbox.la +else +if BOXMODEL_OSMIO4KPLUS +SUBDIRS += libarmbox +libstb_hal_la_LIBADD += \ + libarmbox/libarmbox.la +else #libstb_hal_test_LDADD += -lasound SUBDIRS += libarmbox libdvbci libstb_hal_la_LIBADD += \ libarmbox/libarmbox.la \ libdvbci/libdvbci.la +endif +endif +endif if !ENABLE_GSTREAMER_10 SUBDIRS += libeplayer3 libstb_hal_la_LIBADD += \ libeplayer3/libeplayer3.la endif endif -endif if BOXTYPE_MIPSBOX SUBDIRS += libmipsbox libdvbci diff --git a/acinclude.m4 b/acinclude.m4 index 1a7a4db..6e80562 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, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) 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|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd51|hd60|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -187,6 +187,8 @@ AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") +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_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k") @@ -280,6 +282,10 @@ 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" = "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 diff --git a/common/Makefile.am b/common/Makefile.am index 33c23e4..e847a54 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -35,9 +35,19 @@ if BOXMODEL_HD60 libcommon_la_SOURCES = \ ca.cpp else +if BOXMODEL_OSMIO4K +libcommon_la_SOURCES = \ + ca.cpp +else +if BOXMODEL_OSMIO4KPLUS +libcommon_la_SOURCES = \ + ca.cpp +else libcommon_la_SOURCES = \ ca_ci.cpp endif +endif +endif else libcommon_la_SOURCES = \ ca.cpp diff --git a/include/ca_hal.h b/include/ca_hal.h index 856d99a..71217e6 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -1,4 +1,10 @@ -#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE +#if HAVE_DUCKBOX_HARDWARE \ + || HAVE_MIPS_HARDWARE \ + || (HAVE_ARM_HARDWARE \ + && !BOXMODEL_HD60 \ + && !BOXMODEL_OSMIO4K \ + && !BOXMODEL_OSMIO4KPLUS \ + ) #include "ca_ci.h" #else #include "ca.h" diff --git a/include/cs_api.h b/include/cs_api.h index bfce94c..38134f6 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -23,7 +23,13 @@ inline void cs_api_exit() #define cs_free_uncached free // Callback function helpers -#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE +#if HAVE_DUCKBOX_HARDWARE \ + || HAVE_MIPS_HARDWARE \ + || (HAVE_ARM_HARDWARE \ + && !BOXMODEL_HD60 \ + && !BOXMODEL_OSMIO4K \ + && !BOXMODEL_OSMIO4KPLUS \ + ) void cs_register_messenger(cs_messenger messenger); #else static inline void cs_register_messenger(cs_messenger) { return; }; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index b666305..0271442 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -200,6 +200,40 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "AirDigital"); strcpy(caps.boxname, "Zgemma H7C/S"); strcpy(caps.boxarch, "BCM7251S"); +#endif +#if BOXMODEL_OSMIO4K + initialized = 1; + caps.has_CI = 0; + caps.can_cec = 1; + 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.has_button_timer = 1; + caps.has_button_vformat = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "Edision"); + strcpy(caps.boxname, "OS mio 4K"); + strcpy(caps.boxarch, "BCM72604"); +#endif +#if BOXMODEL_OSMIO4KPLUS + initialized = 1; + caps.has_CI = 0; + 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 = 1; + caps.has_button_timer = 1; + caps.has_button_vformat = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "Edision"); + strcpy(caps.boxname, "OS mio+ 4K"); + strcpy(caps.boxarch, "BCM72604"); #endif return ∩︀ }