Merge branch 'bug_374_missingcodecwarning' into experimental

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index 97a6e7c..77f4322 100644 (file)
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -103,7 +103,7 @@ class eRCConsoleInit
        eRCConsoleDriver driver;
        eRCConsole device;
 public:
-       eRCConsoleInit(): driver("/dev/vc/0"), device(&driver)
+       eRCConsoleInit(): driver("/dev/tty0"), device(&driver)
        {
        }
 };

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index ea9e738..b5de46c 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1860,11 +1860,11 @@ int eDVBFrontend::tuneLoopInt()  // called by m_tuneTimer
                                                int slotid = sec_fe->m_slotid;
                                                // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
                                                if (slotid < 2)
-                                                       sprintf(dev, "/dev/i2c/%d", slotid);
+                                                       sprintf(dev, "/dev/i2c-%d", slotid);
                                                else if (slotid == 2)
-                                                       sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
+                                                       sprintf(dev, "/dev/i2c-2"); // first nim socket on DM8000 use /dev/i2c-2
                                                else if (slotid == 3)
-                                                       sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
+                                                       sprintf(dev, "/dev/i2c-4"); // second nim socket on DM8000 use /dev/i2c-4
                                                int fd = ::open(dev, O_RDWR);
 
                                                unsigned char data[2];

diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp
index fc739e9..bd1439f 100644 (file)
--- a/lib/gdi/accel.cpp
+++ b/lib/gdi/accel.cpp
@@ -138,12 +138,14 @@ int gAccel::fill(gSurface *dst, const eRect &area, unsigned long col)
                col);
        return 0;
 #endif
-#if 0 // def BCM_ACCEL
-       bcm_accel_fill(
-               dst->data_phys, dst->x, dst->y, dst->stride, 
-               area.left(), area.top(), area.width(), area.height(),
-               col);
-       return 0;
+#ifdef BCM_ACCEL
+       if (!m_bcm_accel_state) {
+               bcm_accel_fill(
+                       dst->data_phys, dst->x, dst->y, dst->stride,
+                       area.left(), area.top(), area.width(), area.height(),
+                       col);
+               return 0;
+       }
 #endif
        return -1;
 }

diff --git a/lib/gdi/bcm.cpp b/lib/gdi/bcm.cpp
index 12b5f22..b215b10 100644 (file)
--- a/lib/gdi/bcm.cpp
+++ b/lib/gdi/bcm.cpp
@@ -23,10 +23,10 @@ static int exec_list(void);
 
 int bcm_accel_init(void)
 {
-       fb_fd = open("/dev/fb/0", O_RDWR);
+       fb_fd = open("/dev/fb0", O_RDWR);
        if (fb_fd < 0)
        {
-               perror("/dev/fb/0");
+               perror("/dev/fb0");
                return 1;
        }
        if (exec_list())
@@ -123,6 +123,51 @@ void bcm_accel_fill(
                int x, int y, int width, int height,
                unsigned long color)
 {
-//     printf("unimplemented bcm_accel_fill\n");
+       C(0x43); // reset source
+       C(0x53); // reset dest
+       C(0x5b); // reset pattern
+       C(0x67); // reset blend
+       C(0x75); // reset output
+
+       // clear dest surface
+       P(0x0, 0);
+       P(0x1, 0);
+       P(0x2, 0);
+       P(0x3, 0);
+       P(0x4, 0);
+       C(0x45);
+
+       // clear src surface
+       P(0x0, 0);
+       P(0x1, 0);
+       P(0x2, 0);
+       P(0x3, 0);
+       P(0x4, 0);
+       C(0x5);
+
+       P(0x2d, color);
+
+       P(0x2e, x); // prepare output rect
+       P(0x2f, y);
+       P(0x30, width);
+       P(0x31, height);
+       C(0x6e); // set this rect as output rect
+
+       P(0x0, dst_addr); // prepare output surface
+       P(0x1, dst_stride);
+       P(0x2, dst_width);
+       P(0x3, dst_height);
+       P(0x4, 0x7e48888);
+       C(0x69); // set output surface
+
+       P(0x6f, 0);
+       P(0x70, 0);
+       P(0x71, 2);
+       P(0x72, 2);
+       C(0x73); // select color keying
+
+       C(0x77);  // do it
+
+       exec_list();
 }
 

diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp
index cde3e35..7ee555c 100644 (file)
--- a/lib/gdi/fb.cpp
+++ b/lib/gdi/fb.cpp
@@ -83,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);
        }

diff --git a/lib/gdi/fb.h b/lib/gdi/fb.h
index 5447380..fcb5ff2 100644 (file)
--- a/lib/gdi/fb.h
+++ b/lib/gdi/fb.h
@@ -19,7 +19,7 @@ class fbClass
        int m_number_of_pages;
        int m_phys_mem;
 #ifdef SWIG
-       fbClass(const char *fb="/dev/fb/0");
+       fbClass(const char *fb="/dev/fb0");
        ~fbClass();
 public:
 #else
@@ -41,7 +41,7 @@ public:
        unsigned int Stride() { return stride; }
        fb_cmap *CMAP() { return &cmap; }
 
-       fbClass(const char *fb="/dev/fb/0");
+       fbClass(const char *fb="/dev/fb0");
        ~fbClass();
        
                        // low level gfx stuff

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 518db49..8e4d004 100755 (executable)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -57,7 +57,7 @@ defaultPaths = {
                SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
                
                SCOPE_DEFAULTDIR: (eEnv.resolve("${datadir}/enigma2/defaults/"), PATH_CREATE),
-               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
+               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock6", PATH_DONTCREATE),
                SCOPE_DEFAULTPARTITIONMOUNTDIR: (eEnv.resolve("${datadir}/enigma2/dealer"), PATH_CREATE),
                SCOPE_METADIR: (eEnv.resolve("${datadir}/meta"), PATH_CREATE),
        }

diff --git a/tools/enigma2.sh.in b/tools/enigma2.sh.in
index 5914c3f..2f9292a 100755 (executable)
--- a/tools/enigma2.sh.in
+++ b/tools/enigma2.sh.in
@@ -2,9 +2,10 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
 
-if [ -x @bindir@/showiframe -a -f /boot/backdrop.mvi ]; then
-       @bindir@/showiframe /boot/backdrop.mvi
+if [ -x @bindir@/showiframe -a -f @datadir@/backdrop.mvi ]; then
+       @bindir@/showiframe @datadir@/backdrop.mvi
 fi
 
 # hook to execute scripts always before enigma2 start