From 987dbe7f1d6c728e891e688ad62e9bcdfaa34d06 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <git@tuxcode.de>
Date: Sun, 12 Feb 2017 08:18:18 +0100
Subject: [PATCH] pu/fb-modules: Rename hardware defined macros for coolstream
 stb

  BOXMODEL_NEVIS => BOXMODEL_CS_HD1
  BOXMODEL_APOLLO => BOXMODEL_CS_HD2
---
 src/driver/Makefile.am    | 2 +-
 src/driver/fb_generic.cpp | 6 +++---
 src/driver/fb_generic.h   | 2 +-
 src/driver/screenshot.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 393a5bf8e..b915465ee 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -46,7 +46,7 @@ libneutrino_driver_a_SOURCES = \
 	volume.cpp
 
 if BOXTYPE_COOL
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 libneutrino_driver_a_SOURCES += \
 	fb_accel_cs_hd2.cpp \
 	vfd.cpp
diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp
index 427bdc75f..0c7df12e4 100644
--- a/src/driver/fb_generic.cpp
+++ b/src/driver/fb_generic.cpp
@@ -124,10 +124,10 @@ CFrameBuffer* CFrameBuffer::getInstance()
 		frameBuffer = new CFbAccelSTi();
 #endif
 #if HAVE_COOL_HARDWARE
-#ifdef BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 		frameBuffer = new CFbAccelCSHD1();
 #endif
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		frameBuffer = new CFbAccelCSHD2();
 #endif
 #endif
@@ -511,7 +511,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
 	int w_align;
 	int offs_align;
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (_dx%4 != 0) {
 		w_align = GetWidth4FB_HW_ACC(x, _dx, true);
 		if (w_align < _dx)
diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h
index d451cdb9e..5b2a24402 100644
--- a/src/driver/fb_generic.h
+++ b/src/driver/fb_generic.h
@@ -184,7 +184,7 @@ class CFrameBuffer : public sigc::trackable
 
 		bool getActive() const;                     // is framebuffer active?
 		void setActive(bool enable);                     // is framebuffer active?
-#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 		virtual void setupGXA() {};
 		virtual void add_gxa_sync_marker() {};
 #endif
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index ec1118fae..98b873ca0 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -77,7 +77,7 @@ bool CScreenShot::GetData()
 	bool res = false;
 
 	mutex.lock();
-#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 	CFrameBuffer::getInstance()->setActive(false);
 #endif
 	if (videoDecoder->getBlank()) 
@@ -86,7 +86,7 @@ bool CScreenShot::GetData()
 	res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
 #endif
 
-#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 	/* sort of hack. GXA used to transfer/convert live image to RGB,
 	 * so setup GXA back */
 	CFrameBuffer::getInstance()->setupGXA();