git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
patch by Pieter Grimmerink: use ext3 largefile option only for disks > 4G
[enigma2.git] / lib / gdi / lcd.cpp
diff --git a/lib/gdi/lcd.cpp b/lib/gdi/lcd.cpp
index 844ad08fe9fa8ce4c68a1125fb74d435fe85866b..ac273c61730a9638425a65a9d46c2d7abe0c8b70 100644 (file)
--- a/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@ -1,5 +1,3 @@
-#ifndef DISABLE_LCD
-
 #include <lib/gdi/lcd.h>
 
 #include <unistd.h>
 #include <lib/gdi/lcd.h>
 
 #include <unistd.h>
@@ -13,14 +11,15 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/gdi/glcddc.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/gdi/glcddc.h>
-#include <lib/base/econfig.h>
 
 eDBoxLCD *eDBoxLCD::instance;
 
 eLCD::eLCD(eSize size): res(size)
 {
 
 eDBoxLCD *eDBoxLCD::instance;
 
 eLCD::eLCD(eSize size): res(size)
 {
+       lcdfd = -1;
        locked=0;
        _buffer=new unsigned char[res.height()*res.width()];
        locked=0;
        _buffer=new unsigned char[res.height()*res.width()];
+       memset(_buffer, 0, res.height()*res.width());
        _stride=res.width();
 }
 
        _stride=res.width();
 }
 
@@ -40,46 +39,24 @@ int eLCD::lock()
 
 void eLCD::unlock()
 {
 
 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;
+       locked=0;
 }
 
 }
 
-/* void eLCD::line(ePoint start, ePoint dst, int color)
-{
-int Ax=start.x(), // dieser code rult ganz ganz doll weil er ganz ganz fast ist und auch sehr gut dokumentiert is
-Ay=start.y(), Bx=dst.x(), // t. es handelt sich immerhin um den weltbekannten bresenham algorithmus der nicht nur
-By=dst.y(); int dX, dY, fbXincr, // sehr schnell ist sondern auch sehr gut dokumentiert und getestet wurde. nicht
-fbYincr, fbXYincr, dPr, dPru, P; __u8 // nur auf dem LCD der dbox, sondern auch ueberall anders. und auch auf der
-*AfbAddr = &buffer()[Ay*stride()+Ax]; __u8 // dbox mit LCD soll das teil nun tun, und ich denke das tut es. ausse
-*BfbAddr = &buffer()[By*stride()+Bx]; fbXincr= // rdem hat dieser algo den vorteil dass man fehler sehr leicht fi
-1; if ( (dX=Bx-Ax) >= 0) goto AFTERNEGX; dX=-dX; // ndet und beheben kann. das liegt nicht zuletzt an den komment
-fbXincr=-1; AFTERNEGX: fbYincr=stride(); if ( (dY=By // aren. und ausserdem, je kuerzer der code, desto weniger k
--Ay) >= 0) goto AFTERNEGY; fbYincr=-stride(); dY=-dY;AFTERNEGY: // ann daran falsch sein. erwaehnte ich schon, da
-fbXYincr = fbXincr+fbYincr; if (dY > dX) goto YisIndependent; dPr = dY+ // s dieser tolle code wahnsinnig schnell
-dY; P = -dX; dPru = P+P; dY = dX>>1; XLOOP: *AfbAddr=color; *BfbAddr=color; if ((P+=dPr) > 0) // ist? bye, tmbinc
-goto RightAndUp;  AfbAddr+=fbXincr; BfbAddr-=fbXincr; if ((dY=dY-1) > 0) goto XLOOP; *AfbAddr=color; if ((dX & 1)
-== 0) return;  *BfbAddr=color; return; RightAndUp: AfbAddr+=fbXYincr; BfbAddr-=fbXYincr; P+=dPru; if ((dY=dY-1) >
-0) goto XLOOP;  *AfbAddr=color; if ((dX & 1) == 0) return; *BfbAddr=color; return; YisIndependent: dPr = dX+dX; P
-= -dY; dPru = P+P; dX = dY>>1; YLOOP: *AfbAddr=color; *BfbAddr=color; if ((P+=dPr) > 0) goto RightAndUp2; AfbAddr
-+=fbYincr;  BfbAddr-=fbYincr; if ((dX=dX-1) > 0) goto YLOOP; *AfbAddr=color; if ((dY & 1) == 0) return; *BfbAddr=
-color;return; RightAndUp2: AfbAddr+=fbXYincr; BfbAddr-=fbXYincr; P+=dPru; if ((dX=dX-1) > 0) goto YLOOP; *AfbAddr
-=color; if((dY & 1) == 0) return; *BfbAddr=color; return; // nun ist der tolle code leider zu ende. tut mir leid.
-} */
-
-eDBoxLCD::eDBoxLCD(): eLCD(eSize(128, 64))
+eDBoxLCD::eDBoxLCD(): eLCD(eSize(132, 64))
 {
 #ifndef NO_LCD
 {
 #ifndef NO_LCD
-       lcdfd=open("/dev/dbox/lcd0", O_RDWR);
+       lcdfd = open("/dev/dbox/oled0", O_RDWR);
+       if (lcdfd < 0)
+       {
+               lcdfd = open("/dev/dbox/lcd0", O_RDWR);
+               is_oled = 0;
+       } else
+       {
+               eDebug("found OLED display!");
+               is_oled = 1;
+       }
 #else
 #else
-       lcdfd=-1;
+       lcdfd = -1;
 #endif
        instance=this;
 
 #endif
        instance=this;
 
@@ -89,27 +66,7 @@ eDBoxLCD::eDBoxLCD(): eLCD(eSize(128, 64))
        {
                int i=LCD_MODE_BIN;
                ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i);
        {
                int i=LCD_MODE_BIN;
                ioctl(lcdfd, LCD_IOCTL_ASC_MODE, &i);
-               int lcdbrightness=0, lcdcontrast=0;
-
-               if( eConfig::getInstance()->getKey("/ezap/lcd/brightness", lcdbrightness) )
-               {
-                       lcdbrightness=130;
-                       eConfig::getInstance()->setKey("/ezap/lcd/brightness", lcdbrightness);
-               }
-               if( eConfig::getInstance()->getKey("/ezap/lcd/contrast", lcdcontrast) )
-               {
-                       lcdcontrast=32;
-                       eConfig::getInstance()->setKey("/ezap/lcd/contrast", lcdcontrast);
-               }
-               setLCDParameter(lcdbrightness, lcdcontrast);
-               int tmp;
-               if( eConfig::getInstance()->getKey("/ezap/lcd/inverted", tmp ) )
-               {
-                       inverted=0;
-                       eConfig::getInstance()->setKey("/ezap/lcd/inverted", (int) 0 );
-               }
-               else
-                       inverted=(unsigned char)tmp;
+               inverted=0;
        }
 }
 
        }
 }
 
@@ -119,7 +76,7 @@ void eDBoxLCD::setInverted(unsigned char inv)
        update();       
 }
 
        update();       
 }
 
-int eDBoxLCD::setLCDParameter(int brightness, int contrast)
+int eDBoxLCD::setLCDContrast(int contrast)
 {
        int fp;
        if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
 {
        int fp;
        if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
@@ -132,39 +89,34 @@ int eDBoxLCD::setLCDParameter(int brightness, int contrast)
        {
                eDebug("[LCD] can't set lcd contrast");
        }
        {
                eDebug("[LCD] can't set lcd contrast");
        }
-
-       if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
-       {
-               eDebug("[LCD] can't set lcd brightness");
-       }
-       eDebug("[LCD] set brightness %d, contrast %d", brightness, contrast);
+       close(fp);
        return(0);
 }
 
        return(0);
 }
 
-int eDBoxLCD::switchLCD(int state)
+int eDBoxLCD::setLCDBrightness(int brightness)
 {
 {
-       int lcdbrightness, lcdcontrast, lcdstandby=0;
-
-       eConfig::getInstance()->getKey("/ezap/lcd/contrast", lcdcontrast);
-
-       if(state==0)
+       int fp;
+       if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
        {
        {
-               eConfig::getInstance()->getKey("/ezap/lcd/standby", lcdstandby);
-               setLCDParameter(lcdstandby, lcdcontrast);
+               eDebug("[LCD] can't open /dev/dbox/fp0");
+               return(-1);
        }
        }
-       else
+
+       if(ioctl(fp, FP_IOCTL_LCD_DIMM, &brightness))
        {
        {
-               eConfig::getInstance()->getKey("/ezap/lcd/brightness", lcdbrightness);
-               setLCDParameter(lcdbrightness, lcdcontrast);
-               
+               eDebug("[LCD] can't set lcd brightness");
        }
        }
+       close(fp);
        return(0);
 }
 
 eDBoxLCD::~eDBoxLCD()
 {
        return(0);
 }
 
 eDBoxLCD::~eDBoxLCD()
 {
-       if (lcdfd>0)
+       if (lcdfd>=0)
+       {
                close(lcdfd);
                close(lcdfd);
+               lcdfd=-1;
+       }
 }
 
 eDBoxLCD *eDBoxLCD::getInstance()
 }
 
 eDBoxLCD *eDBoxLCD::getInstance()
@@ -174,37 +126,36 @@ eDBoxLCD *eDBoxLCD::getInstance()
 
 void eDBoxLCD::update()
 {
 
 void eDBoxLCD::update()
 {
-       if (!locked)
+       if (!is_oled)
        {
        {
-               unsigned char raw[120*8];
+               unsigned char raw[132*8];
                int x, y, yy;
                for (y=0; y<8; y++)
                {
                int x, y, yy;
                for (y=0; y<8; y++)
                {
-                       for (x=0; x<120; x++)
+                       for (x=0; x<132; x++)
                        {
                                int pix=0;
                                for (yy=0; yy<8; yy++)
                                {
                        {
                                int pix=0;
                                for (yy=0; yy<8; yy++)
                                {
-                                       pix|=(_buffer[(y*8+yy)*128+x]>=108)<<yy;
+                                       pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
                                }
                                }
-                               raw[y*120+x]=(pix^inverted);
+                               raw[y*132+x]=(pix^inverted);
                        }
                }
                        }
                }
-               if (lcdfd>0)
-                       write(lcdfd, raw, 120*8);
-       }
-}
-
-class eDBoxLCDHardware
-{
-       eDBoxLCD lcd;
-       gLCDDC lcddc;
-public:
-       eDBoxLCDHardware(): lcddc(&lcd)
+               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)
+                       write(lcdfd, raw, 64*64);
        }
        }
-};
-
-eAutoInitP0<eDBoxLCDHardware> init_eDBoxLCDHardware(eAutoInitNumbers::lowlevel, "d-Box LCD Hardware");
+}
 
 
-#endif //DISABLE_LCD
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources