-#if 0
-#ifndef DISABLE_LCD
-
#include <lib/gdi/lcd.h>
#include <unistd.h>
#include <dbox/fp.h>
#include <dbox/lcd-ks0713.h>
-#include <lib/base/esize.h>
-#include <lib/system/init.h>
-#include <lib/system/init_num.h>
+#include <lib/gdi/esize.h>
+#include <lib/base/init.h>
+#include <lib/base/init_num.h>
#include <lib/gdi/glcddc.h>
-#include <lib/system/econfig.h>
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();
}
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;
}
-/* 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))
{
+ 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/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;
{
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;
}
}
update();
}
-int eDBoxLCD::setLCDParameter(int brightness, int contrast)
+int eDBoxLCD::setLCDContrast(int contrast)
{
int fp;
if((fp=open("/dev/dbox/fp0", O_RDWR))<=0)
{
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);
}
-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)
+ eDebug("setLCDBrightness %d", brightness);
+ FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+ if (f)
{
- eConfig::getInstance()->getKey("/ezap/lcd/standby", lcdstandby);
- setLCDParameter(lcdstandby, lcdcontrast);
+ if (fprintf(f, "%d", brightness) == 0)
+ eDebug("write /proc/stb/fp/oled_brightness failed!! (%m)");
+ fclose(f);
}
else
{
- eConfig::getInstance()->getKey("/ezap/lcd/brightness", lcdbrightness);
- setLCDParameter(lcdbrightness, lcdcontrast);
-
+ 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);
}
return(0);
}
eDBoxLCD::~eDBoxLCD()
{
- if (lcdfd>0)
+ if (lcdfd>=0)
{
close(lcdfd);
- lcdfd=0;
+ lcdfd=-1;
}
}
void eDBoxLCD::update()
{
- unsigned char raw[120*8];
- int x, y, yy;
- for (y=0; y<8; y++)
+ if (!is_oled || is_oled == 2)
{
- for (x=0; x<120; x++)
+ unsigned char raw[132*8];
+ int x, y, yy;
+ for (y=0; y<8; y++)
{
- int pix=0;
- for (yy=0; yy<8; yy++)
+ for (x=0; x<132; x++)
{
- pix|=(_buffer[(y*8+yy)*128+x]>=108)<<yy;
+ int pix=0;
+ for (yy=0; yy<8; yy++)
+ {
+ pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+ }
+ raw[y*132+x]=(pix^inverted);
}
- raw[y*120+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
+}
-#endif
git.cweiske.de / enigma2.git / blobdiff