mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

- add osmio4k / osmio4kplus not yet ready

Browse Source 
Conflicts:
	acinclude.m4
	libarmbox/hardware_caps.c

Signed-off-by: Thilo Graf <dbt@novatux.de>

osmio4k only
This commit is contained in:
max_10
2020-02-19 21:57:08 +01:00
committed by Thilo Graf
parent 67110fb054
commit 55839b5f87
6 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@@ -59,18 +59,30 @@ SUBDIRS += libarmbox
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libarmbox/libarmbox.la libarmbox/libarmbox.la
else 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 #libstb_hal_test_LDADD += -lasound
SUBDIRS += libarmbox libdvbci SUBDIRS += libarmbox libdvbci
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libarmbox/libarmbox.la \ libarmbox/libarmbox.la \
libdvbci/libdvbci.la libdvbci/libdvbci.la
endif
endif
endif
if !ENABLE_GSTREAMER_10 if !ENABLE_GSTREAMER_10
SUBDIRS += libeplayer3 SUBDIRS += libeplayer3
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libeplayer3/libeplayer3.la libeplayer3/libeplayer3.la
endif endif
endif endif
endif
if BOXTYPE_MIPSBOX if BOXTYPE_MIPSBOX
SUBDIRS += libmipsbox libdvbci SUBDIRS += libmipsbox libdvbci

9
acinclude.m4
View File

@@ -90,7 +90,7 @@ AC_ARG_WITH(boxmodel,
AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
AS_HELP_STRING([], [valid for spark: spark, spark7162]) 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 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, osmio4kplus]) 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]), AS_HELP_STRING([], [valid for mipsbox: vuduo]),
[case "${withval}" in [case "${withval}" in
generic|raspi) generic|raspi)
@@ -114,7 +114,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi fi
;; ;;
hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|osmio4kplus) hd51|hd60|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
if test "$BOXTYPE" = "armbox"; then if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval" BOXMODEL="$withval"
else else
@@ -187,6 +187,7 @@ AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus") AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus")
AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
@@ -281,8 +282,10 @@ elif test "$BOXMODEL" = "bre2ze4k"; then
AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
elif test "$BOXMODEL" = "h7"; then elif test "$BOXMODEL" = "h7"; then
AC_DEFINE(BOXMODEL_H7, 1, [h7]) AC_DEFINE(BOXMODEL_H7, 1, [h7])
elif test "$BOXMODEL" = "osmio4k"; then
AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k])
elif test "$BOXMODEL" = "osmio4kplus"; then elif test "$BOXMODEL" = "osmio4kplus"; then
AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus]) AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus])
elif test "$BOXMODEL" = "vusolo4k"; then elif test "$BOXMODEL" = "vusolo4k"; then
AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
elif test "$BOXMODEL" = "vuduo4k"; then elif test "$BOXMODEL" = "vuduo4k"; then

10
common/Makefile.am
View File

@@ -35,9 +35,19 @@ if BOXMODEL_HD60
libcommon_la_SOURCES = \ libcommon_la_SOURCES = \
ca.cpp ca.cpp
else else
if BOXMODEL_OSMIO4K
libcommon_la_SOURCES = \
ca.cpp
else
if BOXMODEL_OSMIO4KPLUS
libcommon_la_SOURCES = \
ca.cpp
else
libcommon_la_SOURCES = \ libcommon_la_SOURCES = \
ca_ci.cpp ca_ci.cpp
endif endif
endif
endif
else else
libcommon_la_SOURCES = \ libcommon_la_SOURCES = \
ca.cpp ca.cpp

8
include/ca_hal.h
View File

@@ -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" #include "ca_ci.h"
#else #else
#include "ca.h" #include "ca.h"

8
include/cs_api.h
View File

@@ -23,7 +23,13 @@ inline void cs_api_exit()
#define cs_free_uncached free #define cs_free_uncached free
// Callback function helpers // 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); void cs_register_messenger(cs_messenger messenger);
#else #else
static inline void cs_register_messenger(cs_messenger) { return; }; static inline void cs_register_messenger(cs_messenger) { return; };

50
libarmbox/hardware_caps.c
View File

@@ -201,23 +201,39 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxname, "Zgemma H7C/S"); strcpy(caps.boxname, "Zgemma H7C/S");
strcpy(caps.boxarch, "BCM7251S"); strcpy(caps.boxarch, "BCM7251S");
#endif #endif
#if BOXMODEL_OSMIO4KPLUS #if BOXMODEL_OSMIO4K
initialized = 1; initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_shutdown = 1; caps.can_shutdown = 1;
caps.display_xres = 5; caps.display_xres = 4;
caps.display_type = HW_DISPLAY_LINE_TEXT; caps.display_type = HW_DISPLAY_LED_NUM;
caps.display_can_deepstandby = 1; caps.display_can_deepstandby = 0;
caps.display_can_set_brightness = 1; caps.display_can_set_brightness = 1;
caps.display_has_statusline = 1; caps.display_has_statusline = 1;
caps.has_button_timer = 1; caps.has_button_timer = 1;
caps.has_button_vformat = 0; caps.has_button_vformat = 1;
caps.has_HDMI = 1; caps.has_HDMI = 1;
strcpy(caps.boxvendor, "Edision"); strcpy(caps.boxvendor, "Edision");
strcpy(caps.boxname, "OS Mio+ 4K"); strcpy(caps.boxname, "OS mio 4K");
strcpy(caps.boxarch, "BCM72604"); 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 #endif
return &caps; return &caps;
} }