Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit

lib/hardware/coolstream/Makefile.am

@@ -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

lib/hardware/coolstream/hardware_caps.cpp

@@ -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;

lib/libmd5sum/md5.c

@@ -132,7 +132,7 @@ md5_stream (stream, resblock)
   /* Important: BLOCKSIZE must be a multiple of 64.  */
 #define BLOCKSIZE 4096
   struct md5_ctx ctx;
-  char buffer[BLOCKSIZE + 72];
+  char buffer[BLOCKSIZE + 72] = {0};
   size_t sum;
 
   /* Initialize the computation context.  */

lib/libtuxtxt/tuxtxt_common.h

@@ -704,8 +704,9 @@ void *tuxtxt_CacheThread(void * /*arg*/)
 						tuxtxt_cache.current_subpage[magazine] = -1;
 						continue;
 					}
-
+#if 0	/* ? */
 					b1 &= 3;
+#endif
 					b3 &= 7;
 
 					if (tuxtxt_is_dec(tuxtxt_cache.page_receiving)) /* ignore other subpage bits for hex pages */