WLAN: fix inversed logic for WPA2 vs. WPA/WPA2

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

diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp
index c8fd94be286567f4946825d69a5ed915bb20a278..7ee555c1f266391aefc9dfba2b18d0acb7469df5 100644 (file)
--- a/lib/gdi/fb.cpp
+++ b/lib/gdi/fb.cpp
@@ -7,13 +7,16 @@
 #include <memory.h>
 #include <linux/kd.h>
 
-#include <lib/base/econfig.h>
 #include <lib/gdi/fb.h>
 
 #ifndef FBIO_WAITFORVSYNC
 #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
 #endif
 
+#ifndef FBIO_BLIT
+#define FBIO_SET_MANUAL_BLIT _IOW('F', 0x21, __u8)
+#define FBIO_BLIT 0x22
+#endif
 
 fbClass *fbClass::instance;
 
@@ -24,6 +27,7 @@ fbClass *fbClass::getInstance()
 
 fbClass::fbClass(const char *fb)
 {
+       m_manual_blit=-1;
        instance=this;
        locked=0;
        available=0;
@@ -40,6 +44,8 @@ fbClass::fbClass(const char *fb)
                perror(fb);
                goto nolfb;
        }
+
+
        if (ioctl(fd, FBIOGET_VSCREENINFO, &screeninfo)<0)
        {
                perror("FBIOGET_VSCREENINFO");
@@ -56,6 +62,7 @@ fbClass::fbClass(const char *fb)
        }
 
        available=fix.smem_len;
+       m_phys_mem = fix.smem_start;
        eDebug("%dk video mem", available/1024);
        lfb=(unsigned char*)mmap(0, available, PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0);
        if (!lfb)
@@ -65,6 +72,8 @@ fbClass::fbClass(const char *fb)
        }
 
        showConsole(0);
+
+       enableManualBlit();
        return;
 nolfb:
        lfb=0;
@@ -74,12 +83,12 @@ nolfb:
 
 int fbClass::showConsole(int state)
 {
-       int fd=open("/dev/vc/0", O_RDWR);
+       int fd=open("/dev/tty0", O_RDWR);
        if(fd>=0)
        {
                if(ioctl(fd, KDSETMODE, state?KD_TEXT:KD_GRAPHICS)<0)
                {
-                       eDebug("setting /dev/vc/0 status failed.");
+                       eDebug("setting /dev/tty0 status failed.");
                }
                close(fd);
        }
@@ -94,7 +103,32 @@ int fbClass::SetMode(unsigned int nxRes, unsigned int nyRes, unsigned int nbpp)
        screeninfo.width=0;
        screeninfo.xoffset=screeninfo.yoffset=0;
        screeninfo.bits_per_pixel=nbpp;
-       
+
+       switch (nbpp) {
+       case 16:
+               // ARGB 1555
+               screeninfo.transp.offset = 15;
+               screeninfo.transp.length = 1;
+               screeninfo.red.offset = 10;
+               screeninfo.red.length = 5;
+               screeninfo.green.offset = 5;
+               screeninfo.green.length = 5;
+               screeninfo.blue.offset = 0;
+               screeninfo.blue.length = 5;
+               break;
+       case 32:
+               // ARGB 8888
+               screeninfo.transp.offset = 24;
+               screeninfo.transp.length = 8;
+               screeninfo.red.offset = 16;
+               screeninfo.red.length = 8;
+               screeninfo.green.offset = 8;
+               screeninfo.green.length = 8;
+               screeninfo.blue.offset = 0;
+               screeninfo.blue.length = 8;
+               break;
+       }
+
        if (ioctl(fd, FBIOPUT_VSCREENINFO, &screeninfo)<0)
        {
                // try single buffering
@@ -112,6 +146,8 @@ int fbClass::SetMode(unsigned int nxRes, unsigned int nyRes, unsigned int nbpp)
        
        m_number_of_pages = screeninfo.yres_virtual / nyRes;
        
+       ioctl(fd, FBIOGET_VSCREENINFO, &screeninfo);
+       
        if ((screeninfo.xres!=nxRes) && (screeninfo.yres!=nyRes) && (screeninfo.bits_per_pixel!=nbpp))
        {
                eDebug("SetMode failed: wanted: %dx%dx%d, got %dx%dx%d",
@@ -145,6 +181,14 @@ int fbClass::waitVSync()
        return ioctl(fd, FBIO_WAITFORVSYNC, &c);
 }
 
+void fbClass::blit()
+{
+       if (m_manual_blit == 1) {
+               if (ioctl(fd, FBIO_BLIT) < 0)
+                       perror("FBIO_BLIT");
+       }
+}
+
 fbClass::~fbClass()
 {
        if (available)
@@ -152,6 +196,7 @@ fbClass::~fbClass()
        if (lfb)
                munmap(lfb, available);
        showConsole(1);
+       disableManualBlit();
 }
 
 int fbClass::PutCMAP()
@@ -163,7 +208,13 @@ int fbClass::lock()
 {
        if (locked)
                return -1;
-       locked=1;
+       if (m_manual_blit == 1)
+       {
+               locked = 2;
+               disableManualBlit();
+       }
+       else
+               locked = 1;
        return fd;
 }
 
@@ -171,7 +222,28 @@ void fbClass::unlock()
 {
        if (!locked)
                return;
+       if (locked == 2)  // re-enable manualBlit
+               enableManualBlit();
        locked=0;
        SetMode(xRes, yRes, bpp);
        PutCMAP();
 }
+
+void fbClass::enableManualBlit()
+{
+       unsigned char tmp = 1;
+       if (ioctl(fd,FBIO_SET_MANUAL_BLIT, &tmp)<0)
+               perror("FBIO_SET_MANUAL_BLIT");
+       else
+               m_manual_blit = 1;
+}
+
+void fbClass::disableManualBlit()
+{
+       unsigned char tmp = 0;
+       if (ioctl(fd,FBIO_SET_MANUAL_BLIT, &tmp)<0) 
+               perror("FBIO_SET_MANUAL_BLIT");
+       else
+               m_manual_blit = 0;
+}
+