X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Flcd.cpp;h=a5ac351231894e01b0757e4fad13d56999045c7a;hp=ae0477b44a8635b5c1d30195586fd382ae9cbd40;hb=b72c9852440926ac82fd4ca3186278edd7167427;hpb=2a9ef8598b740983d7c71d4bf55ea7cf07cfa58d

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
old mode 100644
new mode 100755
index ae0477b..a5ac351
--- 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>
@@ -56,7 +60,9 @@ eDBoxLCD::eDBoxLCD()
 	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;
@@ -68,10 +74,6 @@ eDBoxLCD::eDBoxLCD()
 		eDebug("found OLED display!");
 		is_oled = 1;
 	}
-#else
-	lcdfd = -1;
-#endif
-	instance=this;
 
 	if (lcdfd<0)
 		eDebug("couldn't open LCD - load lcd.o!");
@@ -104,6 +106,9 @@ eDBoxLCD::eDBoxLCD()
 			is_oled = 3;
 		}
 	}
+#endif
+	instance=this;
+
 	setSize(xres, yres, bpp);
 }
 
@@ -115,6 +120,7 @@ void eDBoxLCD::setInverted(unsigned char inv)
 
 int eDBoxLCD::setLCDContrast(int contrast)
 {
+#ifndef NO_LCD
 	int fp;
 	if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
 	{
@@ -127,17 +133,21 @@ 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/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
@@ -153,6 +163,7 @@ int eDBoxLCD::setLCDBrightness(int brightness)
 			eDebug("[LCD] can't set lcd brightness (%m)");
 		close(fp);
 	}
+#endif
 	return(0);
 }
 
@@ -172,6 +183,9 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
+#ifdef BUILD_VUPLUS /* ikseong  */
+	return ;
+#endif
 	if (lcdfd >= 0)
 	{
 		if (!is_oled || is_oled == 2)