fix for dm800 oled

[enigma2.git] / lib / gdi / lcd.cpp

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 528b408b3fe4238e2a3507b0cef356a2a81eb909..3911719466e7e1c6b5b37db45585db5161867b5a 100644 (file)
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -16,8 +16,10 @@ eDBoxLCD *eDBoxLCD::instance;
 
 eLCD::eLCD(eSize size): res(size)
 {
+       lcdfd = -1;
        locked=0;
        _buffer=new unsigned char[res.height()*res.width()];
+       memset(_buffer, 0, res.height()*res.width());
        _stride=res.width();
 }
 
@@ -37,26 +39,23 @@ int eLCD::lock()
 
 void eLCD::unlock()
 {
-       read( lcdfd, NULL, 0);
-       if ( errno == 9 )
-       {
-               eDebug("reopen lcd");
-               lcdfd=open("/dev/dbox/lcd0", O_RDWR);  // reopen device
-       }
-       else
-               eDebug("do not reopen lcd.. errno = %d", errno);
-    
        locked=0;
 }
 
 eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 {
+       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");
+               if (f)
+               {
+                       is_oled = 2;
+                       fclose(f);
+               }
                lcdfd = open("/dev/dbox/lcd0", O_RDWR);
-               is_oled = 0;
        } else
        {
                eDebug("found OLED display!");
@@ -102,27 +101,36 @@ int eDBoxLCD::setLCDContrast(int contrast)
 
 int eDBoxLCD::setLCDBrightness(int brightness)
 {
-       int fp;
-       if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
+       eDebug("setLCDBrightness %d", brightness);
+       FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+       if (f)
        {
-               eDebug("[LCD] can't open /dev/dbox/fp0");
-               return(-1);
+               if (fprintf(f, "%d", brightness) == 0)
+                       eDebug("write /proc/stb/fp/oled_brightness failed!! (%m)");
+               fclose(f);
        }
-
-       if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
+       else
        {
-               eDebug("[LCD] can't set lcd brightness");
+               int fp;
+               if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
+               {
+                       eDebug("[LCD] can't open /dev/dbox/fp0");
+                       return(-1);
+               }
+
+               if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness)<=0)
+                       eDebug("[LCD] can't set lcd brightness (%m)");
+               close(fp);
        }
-       close(fp);
        return(0);
 }
 
 eDBoxLCD::~eDBoxLCD()
 {
-       if (lcdfd>0)
+       if (lcdfd>=0)
        {
                close(lcdfd);
-               lcdfd=0;
+               lcdfd=-1;
        }
 }
 
@@ -133,7 +141,7 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
-       if (!is_oled)
+       if (!is_oled || is_oled == 2)
        {
                unsigned char raw[132*8];
                int x, y, yy;
@@ -149,7 +157,7 @@ void eDBoxLCD::update()
                                raw[y*132+x]=(pix^inverted);
                        }
                }
-               if (lcdfd>0)
+               if (lcdfd >= 0)
                        write(lcdfd, raw, 132*8);
        } else
        {
@@ -161,7 +169,7 @@ void eDBoxLCD::update()
                        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)
+               if (lcdfd >= 0)
                        write(lcdfd, raw, 64*64);
        }
 }