X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Flcd.cpp;h=9f43e35af033dc3fc1695650d38f343896537a26;hp=3911719466e7e1c6b5b37db45585db5161867b5a;hb=7ff2c7908114488178ad574b23fcee718515f4fb;hpb=aee1b078bb6e02de8df41fd3f2f3fb774cda8761;ds=sidebyside

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
old mode 100644
new mode 100755
index 3911719..9f43e35
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -14,13 +14,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,14 +48,17 @@ 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);
 	if (lcdfd < 0)
 	{
-		FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+		FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+		if (!f)
+			f = fopen("/proc/stb/fp/oled_brightness", "w");
 		if (f)
 		{
 			is_oled = 2;
@@ -73,13 +82,37 @@ 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;
+		}
 	}
+	setSize(xres, yres, bpp);
 }
 
 void eDBoxLCD::setInverted(unsigned char inv)
 {
 	inverted=inv;
-	update();	
+	update();
 }
 
 int eDBoxLCD::setLCDContrast(int contrast)
@@ -102,11 +135,13 @@ int eDBoxLCD::setLCDContrast(int contrast)
 int eDBoxLCD::setLCDBrightness(int brightness)
 {
 	eDebug("setLCDBrightness %d", brightness);
-	FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+	FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+	if (!f)
+		f = fopen("/proc/stb/fp/oled_brightness", "w");
 	if (f)
 	{
 		if (fprintf(f, "%d", brightness) == 0)
-			eDebug("write /proc/stb/fp/oled_brightness failed!! (%m)");
+			eDebug("write /proc/stb/lcd/oled_brightness failed!! (%m)");
 		fclose(f);
 	}
 	else
@@ -141,36 +176,49 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
-	if (!is_oled || is_oled == 2)
+#ifdef BUILD_VUPLUS /* ikseong  */
+	return ;
+#endif
+	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++)
-		{
-			for (x=0; x<128 / 2; x++)
-				raw[y*64+x] = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
 		}
-		if (lcdfd >= 0)
+		else if (is_oled == 3)
+			write(lcdfd, _buffer, _stride * res.height());
+		else
+		{
+			unsigned char raw[64*64];
+			int x, y;
+			memset(raw, 0, 64*64);
+			for (y=0; y<64; y++)
+			{
+				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;
+				}
+			}
 			write(lcdfd, raw, 64*64);
+		}
 	}
 }