From 86c64163c76bbf7c88fa65b637581da1460d6266 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 10 Mar 2017 15:07:52 +0100 Subject: [PATCH] Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" This reverts commit ec191c5a38ea9d6579ec17cab9c38c461e4a977b because libcoolstream now is updated Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/83de4ba05575ce096ec1485cc8b447e108a53693 Author: vanhofen Date: 2017-03-10 (Fri, 10 Mar 2017) --- lib/hardware/coolstream/hardware_caps.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/hardware/coolstream/hardware_caps.cpp b/lib/hardware/coolstream/hardware_caps.cpp index 4a71d764c..fa4492ae7 100644 --- a/lib/hardware/coolstream/hardware_caps.cpp +++ b/lib/hardware/coolstream/hardware_caps.cpp @@ -18,6 +18,7 @@ hw_caps_t *get_hwcaps(void) { if (initialized) return ∩︀ int rev = cs_get_revision(); + int chip = cs_get_chip_type(); caps.has_fan = (rev < 8); caps.has_HDMI = 1; caps.has_SCART = (rev != 10); @@ -53,9 +54,8 @@ hw_caps_t *get_hwcaps(void) { strcpy(caps.boxname, "Zee"); caps.force_tuner_2G = 1; break; -#ifdef BOXMODEL_CS_HD2 case 11: - if (cs_get_chip_type() == CS_CHIP_SHINER) + if (chip == 33904 /*0x8470*/) { strcpy(caps.boxname, "Trinity"); strcpy(caps.boxarch, "Shiner"); @@ -78,7 +78,6 @@ hw_caps_t *get_hwcaps(void) { strcpy(caps.boxname, "Trinity Duo"); strcpy(caps.boxarch, "Kronos"); break; -#endif default: strcpy(caps.boxname, "UNKNOWN_BOX"); strcpy(caps.boxarch, "Unknown");