mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

hw_caps: remove CFEManager-code; ...

Browse Source 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-14 10:56:45 +02:00
committed by Jacek Jendrzej
parent 254893c889
commit cb19741014
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,6 @@
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

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

@@ -11,8 +11,6 @@
#include <string.h>
#include "hardware_caps.h"
#include <zapit/femanager.h>
static int initialized = 0;
static hw_caps_t caps;
@@ -21,7 +19,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 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan
caps.has_fan = (rev < 8); // see dirty part of hw_caps in neutrino.cpp
caps.has_HDMI = 1;
caps.has_SCART = (rev != 10);
caps.has_SCART_input = 0;
@@ -44,14 +42,7 @@ hw_caps_t *get_hwcaps(void) {
caps.force_tuner_2G = 1;
break;
case 8:
if (CFEManager::getInstance()->getFrontendCount() < 2)
{
strcpy(caps.boxname, "Neo");
}
else
{
strcpy(caps.boxname, "Neo Twin");
}
strcpy(caps.boxname, "Neo"); // see dirty part of hw_caps in neutrino.cpp
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1;
break;