X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/52f7083856d8b9370a02028bd99ad69e6ea75c49..e15e18a6bb21498eb89e68473e8b1a3a5e2310aa:/lib/gdi/lcd.cpp

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 0908d890..518ee1b0 100644
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -4,8 +4,12 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
+#if defined(HAVE_DBOX_FP_H) && defined(HAVE_DBOX_LCD_KS0713_H)
 #include <dbox/fp.h>
 #include <dbox/lcd-ks0713.h>
+#else
+#define NO_LCD 1
+#endif
 
 #include <lib/gdi/esize.h>
 #include <lib/base/init.h>
@@ -14,13 +18,19 @@
 
 eDBoxLCD *eDBoxLCD::instance;
 
-eLCD::eLCD(eSize size): res(size)
+eLCD::eLCD()
 {
 	lcdfd = -1;
 	locked=0;
-	_buffer=new unsigned char[res.height()*res.width()];
-	memset(_buffer, 0, res.height()*res.width());
-	_stride=res.width();
+}
+
+void eLCD::setSize(int xres, int yres, int bpp)
+{
+	res = eSize(xres, yres);
+	_buffer=new unsigned char[xres * yres * bpp/8];
+	memset(_buffer, 0, res.height()*res.width()*bpp/8);
+	_stride=res.width()*bpp/8;
+	eDebug("lcd buffer %p %d bytes, stride %d", _buffer, xres*yres*bpp/8, _stride);
 }
 
 eLCD::~eLCD()
@@ -42,8 +52,9 @@ void eLCD::unlock()
 	locked=0;
 }
 
-eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
+eDBoxLCD::eDBoxLCD()
 {
+	int xres=132, yres=64, bpp=8;
 	is_oled = 0;
 #ifndef NO_LCD
 	lcdfd = open("/dev/dbox/oled0", O_RDWR);
@@ -63,10 +74,6 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 		eDebug("found OLED display!");
 		is_oled = 1;
 	}
-#else
-	lcdfd = -1;
-#endif
-	instance=this;
 
 	if (lcdfd<0)
 		eDebug("couldn't open LCD - load lcd.o!");
@@ -75,17 +82,45 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 		int i=LCD_MODE_BIN;
 		ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i);
 		inverted=0;
+		FILE *f = fopen("/proc/stb/lcd/xres", "r");
+		if (f)
+		{
+			int tmp;
+			if (fscanf(f, "%x", &tmp) == 1)
+				xres = tmp;
+			fclose(f);
+			f = fopen("/proc/stb/lcd/yres", "r");
+			if (f)
+			{
+				if (fscanf(f, "%x", &tmp) == 1)
+					yres = tmp;
+				fclose(f);
+				f = fopen("/proc/stb/lcd/bpp", "r");
+				if (f)
+				{
+					if (fscanf(f, "%x", &tmp) == 1)
+						bpp = tmp;
+					fclose(f);
+				}
+			}
+			is_oled = 3;
+		}
 	}
+#endif
+	instance=this;
+
+	setSize(xres, yres, bpp);
 }
 
 void eDBoxLCD::setInverted(unsigned char inv)
 {
 	inverted=inv;
-	update();	
+	update();
 }
 
 int eDBoxLCD::setLCDContrast(int contrast)
 {
+#ifndef NO_LCD
 	int fp;
 	if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
 	{
@@ -98,11 +133,13 @@ int eDBoxLCD::setLCDContrast(int contrast)
 		eDebug("[LCD] can't set lcd contrast");
 	}
 	close(fp);
+#endif
 	return(0);
 }
 
 int eDBoxLCD::setLCDBrightness(int brightness)
 {
+#ifndef NO_LCD
 	eDebug("setLCDBrightness %d", brightness);
 	FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
 	if (!f)
@@ -126,6 +163,7 @@ int eDBoxLCD::setLCDBrightness(int brightness)
 			eDebug("[LCD] can't set lcd brightness (%m)");
 		close(fp);
 	}
+#endif
 	return(0);
 }
 
@@ -145,42 +183,46 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
-	if (!is_oled || is_oled == 2)
+	if (lcdfd >= 0)
 	{
-		unsigned char raw[132*8];
-		int x, y, yy;
-		for (y=0; y<8; y++)
+		if (!is_oled || is_oled == 2)
 		{
-			for (x=0; x<132; x++)
+			unsigned char raw[132*8];
+			int x, y, yy;
+			for (y=0; y<8; y++)
 			{
-				int pix=0;
-				for (yy=0; yy<8; yy++)
+				for (x=0; x<132; x++)
 				{
-					pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+					int pix=0;
+					for (yy=0; yy<8; yy++)
+					{
+						pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+					}
+					raw[y*132+x]=(pix^inverted);
 				}
-				raw[y*132+x]=(pix^inverted);
 			}
-		}
-		if (lcdfd >= 0)
 			write(lcdfd, raw, 132*8);
-	} else
-	{
-		unsigned char raw[64*64];
-		int x, y;
-		memset(raw, 0, 64*64);
-		for (y=0; y<64; y++)
+		}
+		else if (is_oled == 3)
+			write(lcdfd, _buffer, _stride * res.height());
+		else
 		{
-			int pix=0;
-			for (x=0; x<128 / 2; x++)
+			unsigned char raw[64*64];
+			int x, y;
+			memset(raw, 0, 64*64);
+			for (y=0; y<64; y++)
 			{
-				pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
-				if (inverted)
-					pix = 0xFF - pix;
-				raw[y*64+x] = pix;
+				int pix=0;
+				for (x=0; x<128 / 2; x++)
+				{
+					pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
+					if (inverted)
+						pix = 0xFF - pix;
+					raw[y*64+x] = pix;
+				}
 			}
-		}
-		if (lcdfd >= 0)
 			write(lcdfd, raw, 64*64);
+		}
 	}
 }