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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87cb1b514a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-10 15:38:15 +01:00
parent 98da577319 938e4c22f8
commit b63ce09ff8
4 changed files with 18 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,9 @@
noinst_LIBRARIES = libhwcaps.a
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
if BOXMODEL_CS_HD2
AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream
else
AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream
endif
AM_CPPFLAGS = \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libhwcaps.a
libhwcaps_a_SOURCES = \
hardware_caps.cpp

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

@@ -18,6 +18,7 @@ hw_caps_t *get_hwcaps(void) {
if (initialized)
return &caps;
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);
@@ -33,7 +34,6 @@ hw_caps_t *get_hwcaps(void) {
caps.can_ps_14_9 = 1;
caps.force_tuner_2G = 0;
strcpy(caps.boxvendor, "Coolstream");
/* list of boxnames from neutrinoyparser.cpp */
strcpy(caps.boxarch, "Nevis");
switch (rev) {
case 6:
@@ -41,7 +41,7 @@ hw_caps_t *get_hwcaps(void) {
strcpy(caps.boxname, "HD1");
caps.force_tuner_2G = 1;
break;
case 8:
case 8: // TODO: Neo2 - Twin
strcpy(caps.boxname, "Neo");
caps.force_tuner_2G = 1;
break;
@@ -53,9 +53,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 == CS_CHIP_SHINER)
{
strcpy(caps.boxname, "Trinity");
strcpy(caps.boxarch, "Shiner");
@@ -78,7 +77,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");