Revert "HD1 compat #1; master"

This reverts commit 15e77032a8.


Origin commit data
------------------
Commit: ebc3ce2e43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

lib/hardware/coolstream/hardware_caps.cpp

@@ -20,9 +20,7 @@ hw_caps_t *get_hwcaps(void) {
 	if (initialized)
 		return ∩︀
 	int rev = cs_get_revision();
-#ifdef BOXMODEL_CS_HD2
 	int chip = cs_get_chip_type();
-#endif
 	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);
@@ -57,7 +55,6 @@ hw_caps_t *get_hwcaps(void) {
 		strcpy(caps.boxarch, "Nevis");
 		caps.force_tuner_2G = 1;
 		break;
-#ifdef BOXMODEL_CS_HD2
 	case 9:
 		strcpy(caps.boxname, "Tank");
 		strcpy(caps.boxarch, "Apollo");
@@ -91,7 +88,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");

lib/hardware/coolstream/hd1/libcoolstream/cs_api.h

@@ -17,6 +17,13 @@
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
 
+#define CS_CHIP_APOLLO			0x8490
+#define CS_CHIP_SHINER			0x8470
+#define CS_CHIP_KRONOS_S		0x7540
+#define CS_CHIP_KRONOS_C		0x7550
+#define CS_CHIP_KRONOS_IP		0x7530
+#define CS_CHIP_NEVIS			0x0000	/* workaround for nonexistant nevis chiptype */
+
 enum CS_LOG_MODULE {
 	CS_LOG_CI	= 0,
 	CS_LOG_HDMI_CEC,
@@ -40,6 +47,9 @@ enum CS_LOG_MODULE {
 void cs_api_init(void);
 void cs_api_exit(void);
 
+/* Dummy for compatibility with HD2 */
+#define cs_new_auto_videosystem();
+
 // Memory helpers
 void *cs_malloc_uncached(size_t size);
 void cs_free_uncached(void *ptr);
@@ -71,6 +81,29 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config);
 // Serial nr and revision accessors
 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);
 
 
+// library version functions
+typedef struct cs_libversion_t
+{
+    int    vMajor;
+    int    vMinor;
+    int    vPatch;
+    char   vStr[16];
+    char   vGit[41];
+    char   vGitDescribe[64];
+    time_t vGitTime;
+} cs_libversion_struct_t;
+
+void cs_get_lib_version(cs_libversion_t *ver);
+
+/* return value:
+   -------------
+   1 Library version newer than given version
+   0 library version equals given version
+  -1 Library version older than given version */
+int  cs_compare_lib_versions(int Major, int Minor, int Patch);
+
 #endif //__CS_API_H_

lib/hardware/coolstream/hd1/libcoolstream/video_cs.h

@@ -9,9 +9,11 @@
 #ifndef __VIDEO_CS_H_
 #define __VIDEO_CS_H_
 
+#include <stdint.h>
 #include <cs_vfd.h>
 #include <control.h>
 #include <dmx_cs.h>
+#include <linux/fb.h>
 
 #include "cs_types.h"
 
@@ -123,6 +125,18 @@ typedef enum
    VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
 } VIDEO_CONTROL;
 
+typedef struct cs_vs_format_t
+{
+	char format[16];
+} cs_vs_format_struct_t;
+
+enum {
+	CS_FBCOPY_BB2FB  = 0,
+	CS_FBCOPY_FB2FB  = 1,
+	CS_FBCOPY_MEM2FB = 2,
+	CS_FBCOPY_FB2MEM = 3
+};
+
 class cVideo {
 private:
 	CS_VIDEO_PDATA		*privateData;
@@ -155,6 +169,11 @@ private:
 	vfd_icon		mode_icon;
 	unsigned int		unit;
 	cDemux			*demux;
+	int			current_video_system;
+	bool			isReadScreeninfo;
+	fb_var_screeninfo	varScreeninfo;
+	fb_fix_screeninfo	fixScreeninfo;
+
 	//
 	int SelectAutoFormat();
 	void ScalePic();
@@ -163,6 +182,9 @@ public:
 	cVideo(int mode, void * hChannel, void * hBuffer, unsigned int Unit = 0);
 	~cVideo(void);
 
+	/* Important!
+	   Call this function when osd resolution has been changed */
+	void   updateOsdScreenInfo();
 	void * GetDRM(void);
 	void * GetTVEnc();
 	void * GetTVEncSD();
@@ -207,6 +229,11 @@ public:
 	int64_t GetPTS(void);
 	int Flush(void);
 
+	/* get video system infos */
+	int GetVideoSystem();
+	/* when system = -1 then use current video system */
+	void GetVideoSystemFormatName(cs_vs_format_t* format, int system = -1);
+
 	/* set video_system */
 	int SetVideoSystem(int video_system, bool remember = true);
 	int SetStreamType(VIDEO_FORMAT type);
@@ -234,6 +261,8 @@ public:
 	int  StartVBI(unsigned short pid);
 	int  StopVBI(void);
 	bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
+	int  fbCopy(uint32_t *mem_p, int width, int height, int dst_x, int dst_y, int src_x, int src_y, int mode);
+	int  fbFill(int sx, int sy, int width, int height, fb_pixel_t col, int mode=0);
 	void SetDemux(cDemux *Demux);
 };