lib/gdi/font.cpp: try to fix wrong reordering of some characters

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

diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 6b3532302dec6a7c6d211bf86b78856363b75a0e..0908d890994bc896091bf7844898ff1ce1c27ed0 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,24 +39,32 @@ 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(128, 64))
+eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 {
+       is_oled = 0;
 #ifndef NO_LCD
-       lcdfd=open("/dev/dbox/lcd0", O_RDWR);
+       lcdfd = open("/dev/dbox/oled0", O_RDWR);
+       if (lcdfd < 0)
+       {
+               FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+               if (!f)
+                       f = fopen("/proc/stb/fp/oled_brightness", "w");
+               if (f)
+               {
+                       is_oled = 2;
+                       fclose(f);
+               }
+               lcdfd = open("/dev/dbox/lcd0", O_RDWR);
+       } else
+       {
+               eDebug("found OLED display!");
+               is_oled = 1;
+       }
 #else
-       lcdfd=-1;
+       lcdfd = -1;
 #endif
        instance=this;
 
@@ -64,11 +74,6 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(128, 64))
        {
                int i=LCD_MODE_BIN;
                ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i);
-               int lcdbrightness=0, lcdcontrast=0;
-
-               lcdbrightness=130;
-               lcdcontrast=32;
-               setLCDParameter(lcdbrightness, lcdcontrast);
                inverted=0;
        }
 }
@@ -79,7 +84,7 @@ void eDBoxLCD::setInverted(unsigned char inv)
        update();       
 }
 
-int eDBoxLCD::setLCDParameter(int brightness, int contrast)
+int eDBoxLCD::setLCDContrast(int contrast)
 {
        int fp;
        if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
@@ -92,21 +97,44 @@ int eDBoxLCD::setLCDParameter(int brightness, int contrast)
        {
                eDebug("[LCD] can't set lcd contrast");
        }
+       close(fp);
+       return(0);
+}
 
-       if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
+int eDBoxLCD::setLCDBrightness(int brightness)
+{
+       eDebug("setLCDBrightness %d", brightness);
+       FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+       if (!f)
+               f = fopen("/proc/stb/fp/oled_brightness", "w");
+       if (f)
        {
-               eDebug("[LCD] can't set lcd brightness");
+               if (fprintf(f, "%d", brightness) == 0)
+                       eDebug("write /proc/stb/lcd/oled_brightness failed!! (%m)");
+               fclose(f);
+       }
+       else
+       {
+               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);
        }
-       eDebug("[LCD] set brightness %d, contrast %d", brightness, contrast);
        return(0);
 }
 
 eDBoxLCD::~eDBoxLCD()
 {
-       if (lcdfd>0)
+       if (lcdfd>=0)
        {
                close(lcdfd);
-               lcdfd=0;
+               lcdfd=-1;
        }
 }
 
@@ -117,21 +145,42 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
-       unsigned char raw[120*8];
-       int x, y, yy;
-       for (y=0; y<8; y++)
+       if (!is_oled || is_oled == 2)
+       {
+               unsigned char raw[132*8];
+               int x, y, yy;
+               for (y=0; y<8; y++)
+               {
+                       for (x=0; x<132; x++)
+                       {
+                               int pix=0;
+                               for (yy=0; yy<8; yy++)
+                               {
+                                       pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+                               }
+                               raw[y*132+x]=(pix^inverted);
+                       }
+               }
+               if (lcdfd >= 0)
+                       write(lcdfd, raw, 132*8);
+       } else
        {
-               for (x=0; x<120; x++)
+               unsigned char raw[64*64];
+               int x, y;
+               memset(raw, 0, 64*64);
+               for (y=0; y<64; y++)
                {
                        int pix=0;
-                       for (yy=0; yy<8; yy++)
+                       for (x=0; x<128 / 2; x++)
                        {
-                               pix|=(_buffer[(y*8+yy)*128+x]>=108)<<yy;
+                               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;
                        }
-                       raw[y*120+x]=(pix^inverted);
                }
+               if (lcdfd >= 0)
+                       write(lcdfd, raw, 64*64);
        }
-       if (lcdfd>0)
-               write(lcdfd, raw, 120*8);
 }