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 528b408b3fe4238e2a3507b0cef356a2a81eb909..ac273c61730a9638425a65a9d46c2d7abe0c8b70 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)
 {
 
 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();
 }
 


@@ -37,15 +39,6 @@ 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;
 }
 


@@ -119,10 +112,10 @@ int eDBoxLCD::setLCDBrightness(int brightness)
 
 eDBoxLCD::~eDBoxLCD()
 {
 
 eDBoxLCD::~eDBoxLCD()
 {

-       if (lcdfd>0)
+       if (lcdfd>=0)

        {
                close(lcdfd);
        {
                close(lcdfd);

-               lcdfd=0;
+               lcdfd=-1;

        }
 }
 
        }
 }
 


@@ -149,7 +142,7 @@ void eDBoxLCD::update()
                                raw[y*132+x]=(pix^inverted);
                        }
                }
                                raw[y*132+x]=(pix^inverted);
                        }
                }

-               if (lcdfd>0)
+               if (lcdfd >= 0)

                        write(lcdfd, raw, 132*8);
        } else
        {
                        write(lcdfd, raw, 132*8);
        } else
        {


@@ -161,7 +154,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);
                }
                        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);
        }
 }
                        write(lcdfd, raw, 64*64);
        }
 }