remove BOXTYPE_SPARK

Origin commit data
------------------
Commit: 97e1f43f62
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-11-02 (Tue, 02 Nov 2021)

Origin message was:
------------------
- remove BOXTYPE_SPARK

acinclude.m4

@@ -456,9 +456,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 
 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: generic, spark, coolstream, armbox, mipsbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		generic|spark|coolstream|armbox|mipsbox)
+		generic|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -523,7 +523,6 @@ AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
 
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
-AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")
@@ -569,8 +568,6 @@ AM_CONDITIONAL(BOXMODEL_OSNINOPRO, test "$BOXMODEL" = "osninopro")
 
 if test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
-elif test "$BOXTYPE" = "spark"; then
-	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "coolstream"; then
 	AC_DEFINE(HAVE_CST_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "armbox"; then

configure.ac

@@ -169,11 +169,10 @@ if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
 
-if test "$BOXTYPE" = "coolstream" ||
+if test "$BOXTYPE" = "generic" ||
+   test "$BOXTYPE" = "coolstream" ||
    test "$BOXTYPE" = "armbox" ||
-   test "$BOXTYPE" = "mipsbox" ||
+   test "$BOXTYPE" = "mipsbox"; then
-   test "$BOXTYPE" = "generic" ||
-   test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 

src/Makefile.am

@@ -194,10 +194,6 @@ neutrino_LDADD += \
 	@AVUTIL_LIBS@ \
 	@AVCODEC_LIBS@
 
-if BOXTYPE_SPARK
-neutrino_LDADD += -lass
-endif
-
 if BOXTYPE_MIPSBOX
 neutrino_LDADD += -lass
 endif

src/driver/Makefile.am

@@ -70,11 +70,6 @@ libneutrino_driver_a_SOURCES += \
 endif
 endif
 
-if BOXTYPE_SPARK
-libneutrino_driver_a_SOURCES += \
-	fb_accel_sti.cpp \
-	simple_display.cpp
-endif
 if BOXTYPE_GENERIC
 libneutrino_driver_a_SOURCES += \
 	fb_accel_glfb.cpp \

src/driver/display.h

@@ -2,7 +2,7 @@
 #if HAVE_CST_HARDWARE
 #include <driver/vfd.h>
 #endif
-#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 #include <driver/simple_display.h>
 #endif
 #ifdef ENABLE_GRAPHLCD

src/driver/fade.cpp

@@ -58,7 +58,7 @@ void COSDFader::StartFadeIn()
 	frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
 
 	frameBuffer->setBlendLevel(fadeValue);
-#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
+#if (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
 	usleep(60000);
 #endif
 	fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -112,7 +112,7 @@ bool COSDFader::FadeDone()
 			g_RCInput->killTimer (fadeTimer);
 			fadeIn = false;
 			frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
-#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
+#if (HAVE_CST_HARDWARE && defined(BOXMODEL_CST_HD2))
 			usleep(60000);
 #endif
 		} else

src/driver/fb_accel.h

@@ -29,10 +29,6 @@
 #include <OpenThreads/Condition>
 #include "fb_generic.h"
 
-#if HAVE_SPARK_HARDWARE
-#define PARTIAL_BLIT 1
-#endif
-
 class CFbAccel
 	: public CFrameBuffer
 {
@@ -55,15 +51,6 @@ class CFbAccelSTi
 		OpenThreads::Condition blit_cond;
 		OpenThreads::Mutex blit_mutex;
 		fb_pixel_t *backbuffer;
-#ifdef PARTIAL_BLIT
-		struct {
-			int xs;
-			int ys;
-			int xe;
-			int ye;
-		} to_blit;
-		uint32_t last_xres;
-#endif
 	public:
 		CFbAccelSTi();
 		~CFbAccelSTi();

src/driver/fb_accel_sti.cpp

@@ -156,11 +156,6 @@ void CFbAccelSTi::init(const char * const)
 		return;
 	}
 #endif
-#ifdef PARTIAL_BLIT
-	to_blit.xs = to_blit.ys = INT_MAX;
-	to_blit.xe = to_blit.ye = 0;
-	last_xres = 0;
-#endif
 
 	/* start the autoblit-thread (run() function) */
 	OpenThreads::Thread::start();
@@ -444,20 +439,10 @@ void CFbAccelSTi::_blit()
 	last = now;
 #endif
 	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
-#ifdef PARTIAL_BLIT
-	if (to_blit.xs == INT_MAX)
-		return;
-
-	int srcXa = to_blit.xs;
-	int srcYa = to_blit.ys;
-	int srcXb = to_blit.xe;
-	int srcYb = to_blit.ye;
-#else
 	const int srcXa = 0;
 	const int srcYa = 0;
 	int srcXb = xRes;
 	int srcYb = yRes;
-#endif
 	STMFBIO_BLT_DATA  bltData;
 	memset(&bltData, 0, sizeof(STMFBIO_BLT_DATA));
 
@@ -480,29 +465,10 @@ void CFbAccelSTi::_blit()
 	if (ioctl(fd, FBIOGET_VSCREENINFO, &s) == -1)
 		perror("CFbAccel <FBIOGET_VSCREENINFO>");
 
-#ifdef PARTIAL_BLIT
-	if (s.xres != last_xres) /* fb resolution has changed -> clear artifacts */
-	{
-		last_xres = s.xres;
-		bltData.src_left   = 0;
-		bltData.src_top    = 0;
-		bltData.src_right  = xRes;
-		bltData.src_bottom = yRes;
-	}
-
-	double xFactor = (double)s.xres/(double)xRes;
-	double yFactor = (double)s.yres/(double)yRes;
-
-	int desXa = xFactor * bltData.src_left;
-	int desYa = yFactor * bltData.src_top;
-	int desXb = xFactor * bltData.src_right;
-	int desYb = yFactor * bltData.src_bottom;
-#else
 	const int desXa = 0;
 	const int desYa = 0;
 	int desXb = s.xres;
 	int desYb = s.yres;
-#endif
 
 	/* dst */
 	bltData.dstOffset  = 0;
@@ -528,52 +494,11 @@ void CFbAccelSTi::_blit()
 		perror(LOGTAG "STMFBIO_BLT");
 	if(ioctl(fd, STMFBIO_SYNC_BLITTER) < 0)
 		perror(LOGTAG "blit ioctl STMFBIO_SYNC_BLITTER 2");
-
-#ifdef PARTIAL_BLIT
-	to_blit.xs = to_blit.ys = INT_MAX;
-	to_blit.xe = to_blit.ye = 0;
-#endif
 }
 
-/* not really used yet */
-#ifdef PARTIAL_BLIT
-void CFbAccelSTi::mark(int xs, int ys, int xe, int ye)
-{
-	OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
-	if (xs < to_blit.xs)
-		to_blit.xs = xs;
-	if (ys < to_blit.ys)
-		to_blit.ys = ys;
-	if (xe > to_blit.xe) {
-		if (xe >= (int)xRes)
-			to_blit.xe = xRes - 1;
-		else
-			to_blit.xe = xe;
-	}
-	if (ye > to_blit.ye) {
-		if (ye >= (int)xRes)
-			to_blit.ye = yRes - 1;
-		else
-			to_blit.ye = ye;
-	}
-#if 0
-	/* debug code that kills neutrino right away if the blit area is invalid
-	 * only enable this for creating a coredump for debugging */
-	fb_var_screeninfo s;
-	if (ioctl(fd, FBIOGET_VSCREENINFO, &s) == -1)
-		perror("CFbAccel <FBIOGET_VSCREENINFO>");
-	if ((xe > s.xres) || (ye > s.yres)) {
-		fprintf(stderr, LOGTAG "mark: values out of range xe:%d ye:%d\n", xe, ye);
-		int *kill = NULL;
-		*kill = 1; /* oh my */
-	}
-#endif
-}
-#else
 void CFbAccelSTi::mark(int, int, int, int)
 {
 }
-#endif
 
 /* wrong name... */
 int CFbAccelSTi::setMode(unsigned int, unsigned int, unsigned int)

src/driver/fb_generic.cpp

@@ -126,9 +126,6 @@ CFrameBuffer* CFrameBuffer::getInstance()
 	static CFrameBuffer* frameBuffer = NULL;
 
 	if (!frameBuffer) {
-#if HAVE_SPARK_HARDWARE
-		frameBuffer = new CFbAccelSTi();
-#endif
 #if HAVE_CST_HARDWARE
 #ifdef BOXMODEL_CST_HD1
 		frameBuffer = new CFbAccelCSHD1();

src/driver/lcdd.h

@@ -69,42 +69,6 @@ typedef enum
 } fp_icon;
 #define CVFD CLCD
 
-typedef enum
-{
-	SPARK_PLAY_FASTBACKWARD = 1,
-	SPARK_PLAY = 3,
-	SPARK_PLAY_FASTFORWARD = 5,
-	SPARK_PAUSE = 6,
-	SPARK_REC1 = 7,
-	SPARK_MUTE = 8,
-	SPARK_CYCLE = 9,
-	SPARK_DD = 10,
-	SPARK_CA = 11,
-	SPARK_CI= 12,
-	SPARK_USB = 13,
-	SPARK_DOUBLESCREEN = 14,
-	SPARK_HDD_A8 = 16,
-	SPARK_HDD_A7 = 17,
-	SPARK_HDD_A6 = 18,
-	SPARK_HDD_A5 = 19,
-	SPARK_HDD_A4 = 20,
-	SPARK_HDD_A3 = 21,
-	SPARK_HDD_FULL = 22,
-	SPARK_HDD_A2 = 23,
-	SPARK_HDD_A1 = 24,
-	SPARK_MP3 = 25,
-	SPARK_AC3 = 26,
-	SPARK_TVMODE_LOG = 27,
-	SPARK_AUDIO = 28,
-	SPARK_HDD = 30,
-	SPARK_CLOCK = 33,
-	SPARK_TER = 37,
-	SPARK_SAT = 42,
-	SPARK_TIMESHIFT = 43,
-	SPARK_CAB = 45,
-	SPARK_ALL = 46
-} spark_icon;
-
 #ifdef LCD_UPDATE
 #ifdef HAVE_CONFIG_H
 #include <config.h>

src/driver/newclock.h

@@ -23,9 +23,6 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef HAVE_SPARK_HARDWARE
-#define HAVE_GENERIC_HARDWARE 1
-#endif
 #include <lcddisplay/lcddisplay.h>
 
 void InitNewClock();

src/driver/radiotext.cpp

@@ -757,7 +757,7 @@ void CRadioText::run()
 	uint current_pid = 0;
 
 	printf("CRadioText::run: ###################### Starting thread ######################\n");
-#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	int buflen = 0;
 	unsigned char *buf = NULL;
 	audioDemux = new cDemux(0); // live demux
@@ -788,7 +788,7 @@ void CRadioText::run()
 		}
 		mutex.unlock();
 		if (pid) {
-#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 			int n;
 			unsigned char tmp[6];
 
@@ -831,7 +831,7 @@ void CRadioText::run()
 			}
 		}
 	}
-#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	if (buf)
 		free(buf);
 #endif

src/driver/simple_display.cpp

@@ -1,5 +1,5 @@
 /*
-	Routines to drive simple one-line text or SPARK's 4 digit LED display
+	Routines to drive simple one-line text display
 
 	(C) 2012 Stefan Seyfried
 
@@ -38,14 +38,6 @@
 //#include <math.h>
 #include <sys/stat.h>
 
-#if HAVE_SPARK_HARDWARE
-#include <aotom_main.h>
-#define DISPLAY_DEV "/dev/vfd"
-#include <zapit/zapit.h>
-static bool usb_icon = false;
-static bool timer_icon = false;
-#endif
-
 #if HAVE_GENERIC_HARDWARE
 #define DISPLAY_DEV "/dev/null"
 static bool usb_icon = false;
@@ -186,16 +178,6 @@ void* CLCD::TimeThread(void *)
 		}
 		else
 			CLCD::getInstance()->showTime();
-#if 0
-		/* hack, just if we missed the blit() somewhere
-		 * this will update the framebuffer once per second */
-		if (getenv("SPARK_NOBLIT") == NULL) {
-			CFrameBuffer *fb = CFrameBuffer::getInstance();
-			/* plugin start locks the framebuffer... */
-			if (!fb->Locked())
-				fb->blit();
-		}
-#endif
 	}
 	return NULL;
 }
@@ -262,34 +244,9 @@ void CLCD::showServicename(std::string name, const int num, bool)
 #endif
 }
 
-#if HAVE_SPARK_HARDWARE
-void CLCD::setled(int red, int green)
-{
-	struct aotom_ioctl_data d;
-	int leds[2] = { red, green };
-	int i;
-	int fd = dev_open();
-	if (fd < 0)
-		return;
-
-	printf("CLCD::%s red:%d green:%d\n", __func__, red, green);
-
-	for (i = 0; i < 2; i++)
-	{
-		if (leds[i] == -1)
-			continue;
-		d.u.led.led_nr = i;
-		d.u.led.on = leds[i];
-		if (ioctl(fd, VFDSETLED, &d) < 0)
-			fprintf(stderr, "[neutrino] CLCD::%s VFDSETLED: %m\n", __func__);
-	}
-	close(fd);
-}
-#else
 void CLCD::setled(int /*red*/, int /*green*/)
 {
 }
-#endif
 
 void CLCD::showTime(bool force)
 {
@@ -318,14 +275,8 @@ void CLCD::showTime(bool force)
 		if (force || last_display || (switch_name_time_cnt == 0 && ((hour != t->tm_hour) || (minute != t->tm_min)))) {
 			hour = t->tm_hour;
 			minute = t->tm_min;
-#if !HAVE_SPARK_HARDWARE && !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE
+#if !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE
 			int ret = -1;
-#endif
-#if HAVE_SPARK_HARDWARE
-			now += t->tm_gmtoff;
-			int fd = dev_open();
-			ret = ioctl(fd, VFDSETTIME2, &now);
-			close(fd);
 #endif
 			if (
 				   g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT
@@ -364,12 +315,7 @@ void CLCD::showTime(bool force)
 	blink = !blink;
 	if (led_g)
 		green = blink;
-	if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) {
+
-		if (led_r)
-			SetIcons(SPARK_REC1, red);
-		if (led_g)
-			SetIcons(SPARK_PLAY, green);
-	} else
 	if (led_r || led_g)
 		setled(red, green);
 }
@@ -403,12 +349,8 @@ void CLCD::showVolume(const char vol, const bool update)
 
 	if (muted)
 	{
-		if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
-			SetIcons(SPARK_MUTE, 1);
 		strcpy(s, mutestr[type]);
 	} else {
-		if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
-			SetIcons(SPARK_MUTE, 0);
 		sprintf(s, vol_fmt[type], volume);
 #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 		if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
@@ -486,9 +428,6 @@ void CLCD::setMode(const MODES m, const char * const title)
 	proc_put("/proc/stb/lcd/show_symbols", true);
 	switch (m) {
 	case MODE_TVRADIO:
-		if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
-			SetIcons(SPARK_CYCLE, 0);
-		else
 		setled(0, 0);
 		showclock = true;
 		power = true;
@@ -508,9 +447,6 @@ void CLCD::setMode(const MODES m, const char * const title)
 		proc_put("/proc/stb/lcd/show_symbols", false);
 		break;
 	case MODE_STANDBY:
-		if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
-			SetIcons(SPARK_CYCLE, 1);
-		else
 		setled(0, 1);
 		showclock = true;
 		showTime(true);
@@ -531,44 +467,7 @@ void CLCD::setMode(const MODES m, const char * const title)
 
 void CLCD::setBrightness(int dimm)
 {
-#if HAVE_SPARK_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
-	switch(dimm) {
-	case 15:
-	case 14: dimm = 7; break;
-	case 13:
-	case 12: dimm = 6; break;
-	case 11:
-	case 10: dimm = 5; break;
-	case  9:
-	case  8: dimm = 4; break;
-	case  7:
-	case  6: dimm = 3; break;
-	case  5:
-	case  4: dimm = 2; break;
-	case  3:
-	case  2: dimm = 1; break;
-	case  1:
-	case  0: dimm = 0; break;
-	}
-
-	struct aotom_ioctl_data d;
-
-	if (dimm < 0 || dimm > 7)
-		return;
-
-	if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) {
-		int fd = dev_open();
-		if (fd < 0)
-			return;
-
-		d.u.brightness.level = dimm;
-
-		if (ioctl(fd, VFDBRIGHTNESS, &d) < 0)
-			fprintf(stderr, "[neutrino] CLCD::%s VFDBRIGHTNESS: %m\n", __func__);
-
-		close(fd);
-	}
-#elif HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	std::string value = to_string(255/15*dimm);
 	if (access("/proc/stb/lcd/oled_brightness", F_OK) == 0)
 		proc_put("/proc/stb/lcd/oled_brightness", value.c_str(), value.length());
@@ -698,30 +597,10 @@ void CLCD::Unlock()
 	unlink("/tmp/vfd.locked");
 }
 
-#if HAVE_SPARK_HARDWARE
-void CLCD::Clear()
-{
-	int fd = dev_open();
-	if (fd < 0)
-		return;
-	int ret = ioctl(fd, VFDDISPLAYCLR);
-	if(ret < 0)
-		perror("[neutrino] CLCD::clear() VFDDISPLAYCLR");
-	close(fd);
-	if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) {
-		SetIcons(SPARK_ALL, false);
-		SetIcons(SPARK_CLOCK, timer_icon);
-	}
-	servicename.clear();
-	servicenumber = -1;
-	printf("CLCD::%s\n", __func__);
-}
-#else
 void CLCD::Clear()
 {
 	ShowText(" ", false);
 }
-#endif
 
 void CLCD::count_down()
 {
@@ -768,59 +647,12 @@ void CLCD::setlcdparameter(int dimm, const int _power)
 	setBrightness(dimm);
 }
 
-#if HAVE_SPARK_HARDWARE
-void CLCD::SetIcons(int icon, bool on)
-{
-	struct aotom_ioctl_data d;
-	d.u.icon.icon_nr = icon;
-	if (on == true)
-		d.u.icon.on = 1;
-	else
-		d.u.icon.on = 0;
-	if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) {
-		int fd = dev_open();
-		if (fd < 0)
-			return;
-		if (ioctl(fd, VFDICONDISPLAYONOFF, &d) <0)
-			perror("[neutrino] CLCD::SetIcons() VFDICONDISPLAYONOFF");
-		close(fd);
-	}
-}
-#else
 void CLCD::SetIcons(int, bool)
 {
 }
-#endif
 
 void CLCD::ShowDiskLevel()
 {
-#if HAVE_SPARK_HARDWARE
-	int hdd_icons[9] ={24, 23, 21, 20, 19, 18, 17, 16, 22};
-	int percent, digits, i, j;
-	uint64_t t, u;
-	if (get_fs_usage(g_settings.network_nfs_recordingdir.c_str(), t, u))
-	{
-		SetIcons(SPARK_HDD, true);
-		percent = (int)((u * 1000ULL) / t + 60);
-		digits = percent / 125;
-		if (percent > 1050)
-			digits = 9;
-		//printf("HDD Fuell = %d Digits = %d\n", percent, digits);
-		if (digits > 0)
-		{
-			for (i=0; i<digits; i++)
-				SetIcons(hdd_icons[i], true);
-
-			for (j=i; j < 9; j++)
-				SetIcons(hdd_icons[j], false);
-		}
-	}
-	else
-	{
-		SetIcons(SPARK_HDD, false);
-
-	}
-#else
 	int percent = 0;
 	uint64_t t, u;
 	if (get_fs_usage(g_settings.network_nfs_recordingdir.c_str(), t, u))
@@ -829,19 +661,10 @@ void CLCD::ShowDiskLevel()
 		printf("CLCD::%s %d\n", __func__, percent);
 		proc_put("/proc/stb/lcd/symbol_hddprogress", percent);
 	}
-#endif
 }
 void CLCD::UpdateIcons()
 {
-#if HAVE_SPARK_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
-	CFrontend *aktFE = CFEManager::getInstance()->getLiveFE();
-	SetIcons(SPARK_SAT, aktFE->isSat(aktFE->getCurrentDeliverySystem()));
-	SetIcons(SPARK_CAB, aktFE->isCable(aktFE->getCurrentDeliverySystem()));
-	SetIcons(SPARK_TER, aktFE->isTerr(aktFE->getCurrentDeliverySystem()));
-
-	SetIcons(SPARK_USB, usb_icon);
-#endif
-#if HAVE_SPARK_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	CZapitChannel * chan = CZapit::getInstance()->GetCurrentChannel();
 	if (chan)
 	{
@@ -851,7 +674,6 @@ void CLCD::UpdateIcons()
 		if (chan->getAudioChannel() != NULL)
 		{
 			ShowIcon(FP_ICON_DD, chan->getAudioChannel()->audioChannelType == CZapitAudioChannel::AC3);
-			SetIcons(SPARK_MP3, chan->getAudioChannel()->audioChannelType == CZapitAudioChannel::MPEG);
 		}
 	}
 	ShowDiskLevel();
@@ -866,7 +688,6 @@ void CLCD::ShowIcon(fp_icon i, bool on)
 			led_r = on;
 			if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
 			{
-				SetIcons(SPARK_REC1, on);
 				proc_put("/proc/stb/lcd/symbol_recording", on);
 			}
 			else
@@ -876,7 +697,6 @@ void CLCD::ShowIcon(fp_icon i, bool on)
 			led_g = on;
 			if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT)
 			{
-				SetIcons(SPARK_PLAY, on);
 				proc_put("/proc/stb/lcd/symbol_playback", on);
 			}
 			else
@@ -884,43 +704,31 @@ void CLCD::ShowIcon(fp_icon i, bool on)
 			break;
 		case FP_ICON_USB:
 			usb_icon = on;
-			SetIcons(SPARK_USB, on);
 			proc_put("/proc/stb/lcd/symbol_usb", on);
 			break;
 		case FP_ICON_HDD:
-			SetIcons(SPARK_HDD, on);
 			proc_put("/proc/stb/lcd/symbol_hdd", on);
 			break;
 		case FP_ICON_PAUSE:
-			SetIcons(SPARK_PAUSE, on);
 			break;
 		case FP_ICON_FF:
-			SetIcons(SPARK_PLAY_FASTFORWARD, on);
 			break;
 		case FP_ICON_FR:
-			SetIcons(SPARK_PLAY_FASTBACKWARD, on);
 			break;
 		case FP_ICON_DD:
-			SetIcons(SPARK_DD, on);
-			SetIcons(SPARK_AC3, on);
 			break;
 		case FP_ICON_LOCK:
-			SetIcons(SPARK_CA, on);
 			proc_put("/proc/stb/lcd/symbol_scrambled", on);
 			break;
 		case FP_ICON_RADIO:
-			SetIcons(SPARK_AUDIO, on);
 			break;
 		case FP_ICON_TV:
-			SetIcons(SPARK_TVMODE_LOG, on);
 			proc_put("/proc/stb/lcd/symbol_tv", on);
 			break;
 		case FP_ICON_HD:
-			SetIcons(SPARK_DOUBLESCREEN, on);
 			break;
 		case FP_ICON_CLOCK:
 			timer_icon = on;
-			SetIcons(SPARK_CLOCK, on);
 			proc_put("/proc/stb/lcd/symbol_timeshift", on);
 			break;
 		case FP_ICON_MUTE:

src/driver/simple_display.h

@@ -69,42 +69,6 @@ typedef enum
 	FP_ICON_LOCK
 } fp_icon;
 
-typedef enum
-{
-	SPARK_PLAY_FASTBACKWARD = 1,
-	SPARK_PLAY = 3,
-	SPARK_PLAY_FASTFORWARD = 5,
-	SPARK_PAUSE = 6,
-	SPARK_REC1 = 7,
-	SPARK_MUTE = 8,
-	SPARK_CYCLE = 9,
-	SPARK_DD = 10,
-	SPARK_CA = 11,
-	SPARK_CI= 12,
-	SPARK_USB = 13,
-	SPARK_DOUBLESCREEN = 14,
-	SPARK_HDD_A8 = 16,
-	SPARK_HDD_A7 = 17,
-	SPARK_HDD_A6 = 18,
-	SPARK_HDD_A5 = 19,
-	SPARK_HDD_A4 = 20,
-	SPARK_HDD_A3 = 21,
-	SPARK_HDD_FULL = 22,
-	SPARK_HDD_A2 = 23,
-	SPARK_HDD_A1 = 24,
-	SPARK_MP3 = 25,
-	SPARK_AC3 = 26,
-	SPARK_TVMODE_LOG = 27,
-	SPARK_AUDIO = 28,
-	SPARK_HDD = 30,
-	SPARK_CLOCK = 33,
-	SPARK_TER = 37,
-	SPARK_SAT = 42,
-	SPARK_TIMESHIFT = 43,
-	SPARK_CAB = 45,
-	SPARK_ALL = 46
-} spark_icon;
-
 #include <pthread.h>
 #include <string>
 

src/gui/audio_setup.cpp

@@ -117,17 +117,11 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTIO
 	{ 2, LOCALE_AUDIOMENU_AVSYNC_AM }
 };
 
-#ifdef HAVE_SPARK_HARDWARE
-#define AUDIOMENU_HDMI_DD_OPTION_COUNT 2
-#else
 #define AUDIOMENU_HDMI_DD_OPTION_COUNT 3
-#endif
 const CMenuOptionChooser::keyval AUDIOMENU_HDMI_DD_OPTIONS[AUDIOMENU_HDMI_DD_OPTION_COUNT] =
 {
 	{ HDMI_ENCODED_OFF,		LOCALE_OPTIONS_OFF		},
-#ifndef HAVE_SPARK_HARDWARE
 	{ HDMI_ENCODED_AUTO,		LOCALE_AUDIOMENU_HDMI_DD_AUTO	},
-#endif
 	{ HDMI_ENCODED_FORCED,		LOCALE_AUDIOMENU_HDMI_DD_FORCE	}
 };
 

src/gui/keybind_setup.cpp

@@ -247,7 +247,6 @@ bool checkLongPress(uint32_t key)
 
 int CKeybindSetup::showKeySetup()
 {
-#if !HAVE_SPARK_HARDWARE
 	//save original rc hardware selection and initialize text strings
 	int org_remote_control_hardware = g_settings.remote_control_hardware;
 	char RC_HW_str[4][32];
@@ -257,7 +256,6 @@ int CKeybindSetup::showKeySetup()
 	snprintf(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON], sizeof(RC_HW_str[CRCInput::RC_HW_TRIPLEDRAGON])-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON));
 	char RC_HW_msg[256];
 	snprintf(RC_HW_msg, sizeof(RC_HW_msg)-1, "%s", g_Locale->getText(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1));
-#endif
 
 	//keysetup menu
 	CMenuWidget* keySettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_KEYBINDING, width, MN_WIDGET_ID_KEYSETUP);
@@ -310,7 +308,7 @@ int CKeybindSetup::showKeySetup()
 	mc->setHint("", LOCALE_MENU_HINT_ACCEPT_OTHER_REMOTES);
 	keySettings->addItem(mc);
 #endif
-#if !HAVE_SPARK_HARDWARE
+
 	if (RC_HW_SELECT) {
 		CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE,
 			&g_settings.remote_control_hardware, KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTIONS, KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT, true, NULL,
@@ -318,7 +316,6 @@ int CKeybindSetup::showKeySetup()
 		mc->setHint("", LOCALE_MENU_HINT_KEY_HARDWARE);
 		keySettings->addItem(mc);
 	}
-#endif
 
 	cc = new CMenuOptionNumberChooser(LOCALE_KEYBINDINGMENU_REPEATBLOCK,
 		&g_settings.repeat_blocker, true, 0, 999, this,
@@ -338,7 +335,6 @@ int CKeybindSetup::showKeySetup()
 
 	int res = keySettings->exec(NULL, "");
 
-#if !HAVE_SPARK_HARDWARE
 	//check if rc hardware selection has changed before leaving the menu
 	if (org_remote_control_hardware != g_settings.remote_control_hardware) {
 		g_RCInput->CRCInput::set_rc_hw();
@@ -351,7 +347,6 @@ int CKeybindSetup::showKeySetup()
 			g_RCInput->CRCInput::set_rc_hw();
 		}
 	}
-#endif
 
 	delete keySettings;
 	for (int i = 0; i < KEYBINDS_COUNT; i++)

src/gui/movieplayer.cpp

@@ -1512,11 +1512,6 @@ bool CMoviePlayerGui::PlayFileStart(void)
 		repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on;
 		playstate = CMoviePlayerGui::PLAY;
 		CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
-#if HAVE_SPARK_HARDWARE
-		CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-		CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-		CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-#endif
 		if (timeshift != TSHIFT_MODE_OFF) {
 			startposition = -1;
 			int i;
@@ -1545,12 +1540,6 @@ bool CMoviePlayerGui::PlayFileStart(void)
 				{
 					speed = 0;
 					playstate = CMoviePlayerGui::PAUSE;
-#if HAVE_SPARK_HARDWARE
-					CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
-					CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-					CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-					CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
-#endif
 				}
 				if (timeshift == TSHIFT_MODE_ON)
 					startposition = 0;
@@ -1916,12 +1905,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
 			FileTimeOSD->setMpTimeForced(false);
 			if (playstate > CMoviePlayerGui::PLAY) {
 				playstate = CMoviePlayerGui::PLAY;
-#if HAVE_SPARK_HARDWARE
-				CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-#endif
 				speed = 1;
 				playback->SetSpeed(speed);
 				updateLcd();
@@ -1961,23 +1944,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
 			if (playstate == CMoviePlayerGui::PAUSE) {
 				playstate = CMoviePlayerGui::PLAY;
 				//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
-#if HAVE_SPARK_HARDWARE
-				CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-#endif
 				speed = 1;
 				playback->SetSpeed(speed);
 			} else {
 				playstate = CMoviePlayerGui::PAUSE;
 				//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true);
-#if HAVE_SPARK_HARDWARE
-				CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-#endif
 				speed = 0;
 				playback->SetSpeed(speed);
 			}
@@ -2015,20 +1986,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
 			bool setSpeed = false;
 			if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
 				newspeed = (speed >= 0) ? -1 : (speed - 1);
-#if HAVE_SPARK_HARDWARE
-				CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FR, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-#endif
 			} else {
 				newspeed = (speed <= 0) ? 2 : (speed + 1);
-#if HAVE_SPARK_HARDWARE
-				CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
-				CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-				CVFD::getInstance()->ShowIcon(FP_ICON_FF, true);
-#endif
 			}
 			/* if paused, playback->SetSpeed() start slow motion */
 			if (playback->SetSpeed(newspeed)) {
@@ -2237,10 +2196,6 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
 
 	CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
 	CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
-#if HAVE_SPARK_HARDWARE
-	CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
-	CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
-#endif
 
 	if (restore)
 		restoreNeutrino();

src/gui/user_menue.cpp

@@ -62,9 +62,7 @@
 #include "plugins.h"
 #include "imageinfo_ni.h" //NI
 #include "dboxinfo.h"
-#if !HAVE_SPARK_HARDWARE
 #include "cam_menu.h"
-#endif
 #include "pluginlist.h"
 #include "infoclock.h"
 #include "rc_lock.h"
@@ -97,9 +95,7 @@
 extern CRemoteControl * g_RemoteControl;	/* neutrino.cpp */
 extern CPlugins * g_Plugins;			/* neutrino.cpp */
 extern cVideo * videoDecoder;
-#if !HAVE_SPARK_HARDWARE
 extern CCAMMenuHandler * g_CamHandler;
-#endif
 std::string CUserMenu::tmp;
 // 
 #include <system/debug.h>
@@ -408,7 +404,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO);
 			break;
 		}
-#if !HAVE_SPARK_HARDWARE
 		case SNeutrinoSettings::ITEM_CAM:
 		{
 			keyhelper.get(&key,&icon);
@@ -416,7 +411,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
 		}
-#endif
 		case SNeutrinoSettings::ITEM_CLOCK:
 		{
 			keyhelper.get(&key,&icon); 

src/gui/user_menue_setup.cpp

@@ -54,11 +54,7 @@
 #include <system/debug.h>
 
 static bool usermenu_show = true;
-#if HAVE_SPARK_HARDWARE
-static bool usermenu_show_cam = false; // FIXME -- use hwcaps?
-#else
 static bool usermenu_show_cam = true; // FIXME -- use hwcaps?
-#endif
 struct keyvals
 {
 	const int key;

src/gui/videosettings.cpp

@@ -264,30 +264,6 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
 	{ -1,                NONEXISTANT_LOCALE, "2160p 50Hz"   },
 	{ VIDEO_STD_AUTO,    NONEXISTANT_LOCALE, "Auto"         }
 };
-#elif HAVE_SPARK_HARDWARE
-CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
-{
-	{ -1,                NONEXISTANT_LOCALE, "NTSC"		},
-	{ VIDEO_STD_PAL,     NONEXISTANT_LOCALE, "PAL"		},
-	{ -1,                NONEXISTANT_LOCALE, "SECAM"	},
-	{ -1,                NONEXISTANT_LOCALE, "480p"		},
-	{ VIDEO_STD_576P,    NONEXISTANT_LOCALE, "576p"		},
-	{ VIDEO_STD_720P50,  NONEXISTANT_LOCALE, "720p 50Hz"	},
-	{ VIDEO_STD_720P60,  NONEXISTANT_LOCALE, "720p 60Hz"	},
-	{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz"	},
-	{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "1080p 23.97Hz"},
-	{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz"	},
-	{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz"	},
-	{ -1, 		     NONEXISTANT_LOCALE, "1080p 29.97Hz"},
-	{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "1080p 60Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "2160p 24Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "2160p 25Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "2160p 30Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "2160p 50Hz"   },
-	{ -1,                NONEXISTANT_LOCALE, "Auto"		}
-};
 #elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
 CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
 {
@@ -428,7 +404,7 @@ int CVideoSettings::showVideoSetup()
 #endif
 	}
 #ifndef BOXMODEL_CST_HD2
-	else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */
+	else if (g_info.hw_caps->has_SCART)
 	{
 		vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this);
 	}

src/lcddisplay/lcddisplay.cpp

@@ -25,9 +25,6 @@
 */
 
 #include <config.h>
-#if HAVE_SPARK_HARDWARE
-#define HAVE_GENERIC_HARDWARE 1
-#endif
 #include "lcddisplay.h"
 
 #include <png.h>

src/lcddisplay/lcddisplay.h

@@ -26,10 +26,6 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef HAVE_SPARK_HARDWARE
-#error src/lcddisplay/lcddisplay.h must not be included on SPARK
-#endif
-
 #ifdef HAVE_GENERIC_HARDWARE
 // dummy
 #define LCD_ROWS	8

src/zapit/include/zapit/frontend_types.h

@@ -69,13 +69,7 @@
 #if ((DVB_API_VERSION > 5) || (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR > 6))
 #define _HAVE_DVB57 1
 #else
-#if HAVE_SPARK_HARDWARE
-#ifdef WARN_DVBAPI
-#warning DVB_API < 5.7 -- no DVB-T2/DTMB support.
-#endif
-#else
 #error DVB_API < 5.7 => fix your toolchain
-#endif
 /* this is actually needed before 5.5, not 5.7, but this works for now */
 #define SYS_DVBC_ANNEX_A SYS_DVBC_ANNEX_AC
 #endif

src/zapit/src/bouquets.cpp

@@ -449,10 +449,6 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
 				if (uName)
 					uname = uName;
 				const char *url = xmlGetAttribute(channel_node, "u");
-#if HAVE_SPARK_HARDWARE
-				if (url && ((uintptr_t)url % 4))
-					url = std::string(url).c_str(); /* hack to ensure buffer is aligned */
-#endif
 				GET_ATTR(channel_node, "i", SCANF_SERVICE_ID_TYPE, service_id);
 				GET_ATTR(channel_node, "on", SCANF_ORIGINAL_NETWORK_ID_TYPE, original_network_id);
 				GET_ATTR(channel_node, "s", SCANF_SATELLITE_POSITION_TYPE, satellitePosition);

src/zapit/src/capmt.cpp

@@ -257,7 +257,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 			break;
 		case STREAM:
 		case RECORD:
-#if HAVE_SPARK_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 //			INFO("RECORD/STREAM(%d): fe_num %d rec_dmx %d", mode, frontend ? frontend->getNumber() : -1, channel->getRecordDemux());
 #ifdef DYNAMIC_DEMUX
 			source = channel->getRecordDemux();
@@ -274,7 +274,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 			INFO("RECORD/STREAM(%d): fe_num %d rec_dmx %d", mode, source, demux);
 			break;
 		case PIP:
-#if HAVE_SPARK_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
+#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 #ifdef DYNAMIC_DEMUX
 			source = channel->getPipDemux();
 			demux = channel->getPipDemux();