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/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-06-18 12:21:18 +02:00
parent 88de018881 b295c863d0
commit 80eba228d6
8 changed files with 847 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@
*
* License: GPL v2 or later
*/
#include <config.h>
#include "cs_api.h"
#include <stdio.h>
#include <string.h>
@@ -21,10 +20,7 @@ hw_caps_t *get_hwcaps(void) {
if (initialized)
return &caps;
int rev = cs_get_revision();
int chip = 0;
#ifdef BOXMODEL_CS_HD2
chip = cs_get_chip_type();
#endif
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_HDMI = 1;
caps.has_SCART = (rev != 10);

2
lib/hardware/coolstream/hd1/libcoolstream/cs_api.h
View File

@@ -82,7 +82,7 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config);
unsigned long long cs_get_serial(void);
unsigned int cs_get_revision(void);
/* Dummy function for compatibility with hd2 */
//unsigned int cs_get_chip_type(void);
unsigned int cs_get_chip_type(void);
// library version functions