mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit c225c2d4b6
.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.
This commit is contained in:
committed by
Jacek Jendrzej
parent
d0a21abd9f
commit
e2db590797
@@ -1,13 +1,6 @@
|
|||||||
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
|
||||||
|
@@ -11,8 +11,6 @@
|
|||||||
#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;
|
||||||
|
|
||||||
@@ -21,7 +19,7 @@ hw_caps_t *get_hwcaps(void) {
|
|||||||
return ∩︀
|
return ∩︀
|
||||||
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 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan
|
caps.has_fan = (rev < 8);
|
||||||
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;
|
||||||
@@ -36,23 +34,15 @@ 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:
|
case 8: // TODO: Neo2 - Twin
|
||||||
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:
|
||||||
@@ -61,7 +51,6 @@ 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:
|
||||||
|
Reference in New Issue
Block a user