hardware_caps: fix has_fan and add detection of Neo Twin

Origin commit data
------------------
Branch: ni/coolstream
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-19 01:04:48 +01:00
parent 0c4a37ad58
commit 2770d07bea
2 changed files with 22 additions and 4 deletions

View File

@@ -1,6 +1,13 @@
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/libeventserver \
@HWLIB_CFLAGS@ @HWLIB_CFLAGS@
noinst_LIBRARIES = libhwcaps.a noinst_LIBRARIES = libhwcaps.a

View File

@@ -11,6 +11,8 @@
#include <string.h> #include <string.h>
#include "hardware_caps.h" #include "hardware_caps.h"
#include <zapit/femanager.h>
static int initialized = 0; static int initialized = 0;
static hw_caps_t caps; static hw_caps_t caps;
@@ -19,7 +21,7 @@ hw_caps_t *get_hwcaps(void) {
return &caps; return &caps;
int rev = cs_get_revision(); int rev = cs_get_revision();
int chip = cs_get_chip_type(); int chip = cs_get_chip_type();
caps.has_fan = (rev < 8); caps.has_fan = (rev < 8 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan
caps.has_HDMI = 1; caps.has_HDMI = 1;
caps.has_SCART = (rev != 10); caps.has_SCART = (rev != 10);
caps.has_SCART_input = 0; caps.has_SCART_input = 0;
@@ -34,15 +36,23 @@ hw_caps_t *get_hwcaps(void) {
caps.can_ps_14_9 = 1; caps.can_ps_14_9 = 1;
caps.force_tuner_2G = 0; caps.force_tuner_2G = 0;
strcpy(caps.boxvendor, "Coolstream"); strcpy(caps.boxvendor, "Coolstream");
strcpy(caps.boxarch, "Nevis");
switch (rev) { switch (rev) {
case 6: case 6:
case 7: // Black Stallion Edition case 7: // Black Stallion Edition
strcpy(caps.boxname, "HD1"); strcpy(caps.boxname, "HD1");
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 8: // TODO: Neo2 - Twin case 8:
if (CFEManager::getInstance()->getFrontendCount() < 2)
{
strcpy(caps.boxname, "Neo"); strcpy(caps.boxname, "Neo");
}
else
{
strcpy(caps.boxname, "Neo Twin");
}
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 9: case 9:
@@ -51,6 +61,7 @@ hw_caps_t *get_hwcaps(void) {
break; break;
case 10: case 10:
strcpy(caps.boxname, "Zee"); strcpy(caps.boxname, "Zee");
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 11: case 11: