From 184d327d5cb06fe7a473f218ac729f78ceb7a61a Mon Sep 17 00:00:00 2001 From: BPanther Date: Sat, 25 May 2024 20:32:19 +0200 Subject: [PATCH] dm900 added, not yet ready --- acinclude.m4 | 20 ++++++++++++++++---- src/driver/display.h | 2 +- src/driver/rcinput.h | 4 ++-- src/gui/dboxinfo.cpp | 8 ++++---- src/neutrino.cpp | 2 +- src/zapit/src/frontend.cpp | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 24966a190..2a9ff6723 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -315,7 +315,7 @@ AC_ARG_WITH(boxtype, BOXTYPE="duckbox" BOXMODEL="$withval" ;; - hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus) + hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm900) BOXTYPE="armbox" BOXMODEL="$withval" ;; @@ -332,7 +332,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, e4hdultra, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7]) +AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, e4hdultra, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7, dm900]) AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm8000]) AS_HELP_STRING([], [valid for generic: raspi]), [case "${withval}" in @@ -350,7 +350,7 @@ AS_HELP_STRING([], [valid for generic: raspi]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus) + hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm900) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -425,6 +425,7 @@ AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2") AM_CONDITIONAL(BOXMODEL_VUUNO, test "$BOXMODEL" = "vuuno") AM_CONDITIONAL(BOXMODEL_VUULTIMO, test "$BOXMODEL" = "vuultimo") AM_CONDITIONAL(BOXMODEL_DM820, test "$BOXMODEL" = "dm820") +AM_CONDITIONAL(BOXMODEL_DM900, test "$BOXMODEL" = "dm900") AM_CONDITIONAL(BOXMODEL_DM8000, test "$BOXMODEL" = "dm8000") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") @@ -436,6 +437,8 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" = "vuduo4k" -o "$BOXMODEL" = "vuduo4kse" -o "$BOXMODEL" = "vuultimo4k" -o "$BOXMODEL" = "vuzero4k" -o "$BOXMODEL" = "vuuno4kse" -o "$BOXMODEL" = "vuuno4k") AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$BOXMODEL" = "vuduo" -o "$BOXMODEL" = "vuduo2" -o "$BOXMODEL" = "vuuno" -o "$BOXMODEL" = "vuultimo") +AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm900") + if test "$BOXTYPE" = "spark"; then AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux]) AC_DEFINE(HAVE_SH4_HARDWARE, 1, [building for a sh4 box]) @@ -523,6 +526,8 @@ elif test "$BOXMODEL" = "vuultimo"; then AC_DEFINE(BOXMODEL_VUULTIMO, 1, [vuultimo]) elif test "$BOXMODEL" = "dm820"; then AC_DEFINE(BOXMODEL_DM820, 1, [dm820]) +elif test "$BOXMODEL" = "dm900"; then + AC_DEFINE(BOXMODEL_DM900, 1, [dm900]) elif test "$BOXMODEL" = "dm8000"; then AC_DEFINE(BOXMODEL_DM8000, 1, [dm8000]) elif test "$BOXMODEL" = "h7"; then @@ -537,7 +542,7 @@ fi # Support Boxmodel with OSD-Resolution case "$BOXMODEL" in - bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm820) + bre2ze4k|hd51|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm820|dm900) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac @@ -562,6 +567,13 @@ case "$BOXMODEL" in AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips]) ;; esac + +# all dreambox BOXMODELs +case "$BOXMODEL" in + dm8000|dm820|dm900) + AC_DEFINE(BOXMODEL_DREAMBOX_ALL, 1, [dreambox_all]) + ;; +esac ]) dnl backward compatiblity diff --git a/src/driver/display.h b/src/driver/display.h index 31dec6f5f..f17d0757c 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -2,7 +2,7 @@ #if HAVE_DUCKBOX_HARDWARE #include #endif -#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if BOXMODEL_DM8000 || BOXMODEL_DM820 #include #define CVFD CLCD diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 6790cf1d8..0dbe75130 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -245,7 +245,7 @@ class CRCInput RC_play = KEY_PLAY, RC_pause = KEY_PAUSE, RC_pvr = KEY_PVR, -#if BOXMODEL_DM820 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM8000 RC_forward = KEY_NEXTSONG, RC_rewind = KEY_PREVIOUSSONG, #else @@ -279,7 +279,7 @@ class CRCInput RC_prog4 = KEY_PROG4, RC_media = KEY_MEDIA, RC_search = KEY_SEARCH, -#if BOXMODEL_DM820 || BOXMODEL_DM8000 +#if BOXMODEL_DM820 || BOXMODEL_DM900 || BOXMODEL_DM8000 RC_nextsong = KEY_FORWARD, RC_previoussong = KEY_REWIND, #else diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index f20242668..ac635f83d 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -54,7 +54,7 @@ #include #include -#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) +#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) || defined (BOXMODEL_DM900) #include #endif @@ -257,7 +257,7 @@ void CDBoxInfoWidget::paint() height += mheight; // time height += mheight; // uptime height += mheight; // load -#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) +#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) || defined (BOXMODEL_DM900) if (frontend_count < 7) height += mheight; // temp #endif @@ -443,7 +443,7 @@ void CDBoxInfoWidget::paint() str_boot_title += ": "; std::string str_up_title(g_Locale->getText(LOCALE_EXTRA_DBOXINFO_UPTIME)); str_up_title += ": "; -#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) +#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) || defined (BOXMODEL_DM900) #if defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) std::string str_cputemp_title("System"/*g_Locale->getText(LOCALE_EXTRA_DBOXINFO_SYSTEMP)*/); #else @@ -512,7 +512,7 @@ void CDBoxInfoWidget::paint() } ypos += mheight; -#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) +#if defined (BOXMODEL_VUPLUS_ARM) || defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) || defined (BOXMODEL_DM900) // paint cpu temp char proc_cputemp[8]; #if defined (BOXMODEL_VUDUO2) || defined (BOXMODEL_VUULTIMO) || defined (BOXMODEL_VUUNO) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7d79df61c..cc9b13721 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -269,7 +269,7 @@ CNeutrinoApp::CNeutrinoApp() frameBuffer = CFrameBuffer::getInstance(); frameBuffer->setIconBasePath(ICONSDIR); SetupFrameBuffer(); -#if BOXMODEL_DM820 // needs setup twice +#if BOXMODEL_DM820 || BOXMODEL_DM900 // needs setup twice SetupFrameBuffer(); #endif diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index f58ab85e4..639dc0a5f 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -746,7 +746,7 @@ uint32_t CFrontend::getBitErrorRate(void) const return ber; } -#if BOXMODEL_DM820 +#if BOXMODEL_DM820 || BOXMODEL_DM900 #define M_STRENGTH 350 #define M_SNR 35 #else