From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 6 Oct 2010 09:53:08 +0000 (+0200)
Subject: Merge branch 'bug_514_new_proc_oled_brightness_path'
X-Git-Tag: 3.0.0~80
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/cb90a5fd3bdf08bff87beb7e310090731938ed29?hp=0e903a5d9d38bd48c792c095d786fc40091a47fa

Merge branch 'bug_514_new_proc_oled_brightness_path'
---

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index ecc19b53..0908d890 100644
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -49,7 +49,9 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 	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;
@@ -102,11 +104,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