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

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-19 08:38:15 +01:00
parent e83a255e95 720269c99a
commit 2ca9d9c4f9
8 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/hardware/coolstream/Makefile.am
View File

@@ -1,6 +1,13 @@
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
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@
noinst_LIBRARIES = libhwcaps.a

19
lib/hardware/coolstream/hardware_caps.cpp
View File

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