From 606abfa9cec849b753e45f029ab9dae61365e065 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 16 Jun 2017 19:10:23 +0200 Subject: [PATCH 1/2] Revert "HD1: Workaround for missing cs_get_chip_type" This reverts commit eac2dccfb63b428d65d12c43b395e9d571f3d880. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e3cc6cee67f5314efb0222d533d76001a60ea686 Author: Michael Liebmann Date: 2017-06-16 (Fri, 16 Jun 2017) --- lib/hardware/coolstream/hardware_caps.cpp | 6 +----- lib/hardware/coolstream/hd1/libcoolstream/cs_api.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/hardware/coolstream/hardware_caps.cpp b/lib/hardware/coolstream/hardware_caps.cpp index e5af0e255..139825c32 100644 --- a/lib/hardware/coolstream/hardware_caps.cpp +++ b/lib/hardware/coolstream/hardware_caps.cpp @@ -6,7 +6,6 @@ * * License: GPL v2 or later */ -#include #include "cs_api.h" #include #include @@ -21,10 +20,7 @@ hw_caps_t *get_hwcaps(void) { if (initialized) return ∩︀ int rev = cs_get_revision(); - int chip = 0; -#ifdef BOXMODEL_CS_HD2 - chip = cs_get_chip_type(); -#endif + int chip = cs_get_chip_type(); caps.has_fan = (rev < 8 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan caps.has_HDMI = 1; caps.has_SCART = (rev != 10); diff --git a/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h index 80dd47ade..9a4e77259 100644 --- a/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h +++ b/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h @@ -82,7 +82,7 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config); unsigned long long cs_get_serial(void); unsigned int cs_get_revision(void); /* Dummy function for compatibility with hd2 */ -//unsigned int cs_get_chip_type(void); +unsigned int cs_get_chip_type(void); // library version functions From a411585bc37ba7a7a8bc0b10a19bd2cf57454f6f Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 16 Jun 2017 19:05:59 +0200 Subject: [PATCH 2/2] COsdHelpers: Fix video system switching on HD1 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/224521bc40bcaeb9c5198565286544658ba400c9 Author: Michael Liebmann Date: 2017-06-16 (Fri, 16 Jun 2017) --- src/gui/osd_helpers.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp index 2675cffef..b5bb20127 100644 --- a/src/gui/osd_helpers.cpp +++ b/src/gui/osd_helpers.cpp @@ -156,17 +156,10 @@ int COsdHelpers::isVideoSystem1080(int res) return false; } -#ifdef ENABLE_CHANGE_OSD_RESOLUTION int COsdHelpers::getVideoSystem() { return videoDecoder->GetVideoSystem(); } -#else -int COsdHelpers::getVideoSystem() -{ - return g_settings.video_Mode; -} -#endif uint32_t COsdHelpers::getOsdResolution() {