add bcm accel

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

diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp
index dcc5db04cb83a5302bf010e06694ea032bf1bdfa..bf9a5a44d26f3039aa908f67f3c382f36e879dde 100644 (file)
--- a/lib/gdi/accel.cpp
+++ b/lib/gdi/accel.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/gdi/accel.h>
@@ -8,7 +9,9 @@
 #include <lib/gdi/gpixmap.h>
 
 gAccel *gAccel::instance;
+#define BCM_ACCEL
 
+#ifdef ATI_ACCEL
 extern int ati_accel_init(void);
 extern void ati_accel_close(void);
 extern void ati_accel_blit(
@@ -20,6 +23,20 @@ extern void ati_accel_fill(
                int dst_addr, int dst_width, int dst_height, int dst_stride,
                int x, int y, int width, int height,
                unsigned long color);
+#endif
+#ifdef BCM_ACCEL
+extern int bcm_accel_init(void);
+extern void bcm_accel_close(void);
+extern void bcm_accel_blit(
+               int src_addr, int src_width, int src_height, int src_stride,
+               int dst_addr, int dst_width, int dst_height, int dst_stride,
+               int src_x, int src_y, int width, int height,
+               int dst_x, int dst_y, int dwidth, int dheight);
+extern void bcm_accel_fill(
+               int dst_addr, int dst_width, int dst_height, int dst_stride,
+               int x, int y, int width, int height,
+               unsigned long color);
+#endif
 
 gAccel::gAccel()
 {
@@ -32,12 +49,18 @@ gAccel::gAccel()
 #ifdef ATI_ACCEL       
        ati_accel_init();
 #endif
+#ifdef BCM_ACCEL       
+       m_bcm_accel_state = bcm_accel_init();
+#endif
 }
 
 gAccel::~gAccel()
 {
 #ifdef ATI_ACCEL
        ati_accel_close();
+#endif
+#ifdef BCM_ACCEL
+       bcm_accel_close();
 #endif
        instance = 0;
 }
@@ -61,7 +84,7 @@ void gAccel::setAccelMemorySpace(void *addr, int phys_addr, int size)
        m_accel_phys_addr = phys_addr;
 }
 
-int gAccel::blit(gSurface *dst, const gSurface *src, const ePoint &p, const eRect &area, int flags)
+int gAccel::blit(gSurface *dst, const gSurface *src, const eRect &p, const eRect &area, int flags)
 {
 #ifdef ATI_ACCEL
        ati_accel_blit(
@@ -70,6 +93,17 @@ int gAccel::blit(gSurface *dst, const gSurface *src, const ePoint &p, const eRec
                area.left(), area.top(), area.width(), area.height(),
                p.x(), p.y());
        return 0;
+#endif
+#ifdef BCM_ACCEL
+       if (!m_bcm_accel_state)
+       {
+               bcm_accel_blit(
+                       src->data_phys, src->x, src->y, src->stride,
+                       dst->data_phys, dst->x, dst->y, dst->stride, 
+                       area.left(), area.top(), area.width(), area.height(),
+                       p.x(), p.y(), p.width(), p.height());
+               return 0;
+       }
 #endif
        return -1;
 }
@@ -82,15 +116,23 @@ int gAccel::fill(gSurface *dst, const eRect &area, unsigned long col)
                area.left(), area.top(), area.width(), area.height(),
                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;
 #endif
        return -1;
 }
 
 int gAccel::accelAlloc(void *&addr, int &phys_addr, int size)
 {
+       eDebug("accel %d bytes", size);
        if ((!size) || (!m_accel_allocation))
        {
-               eDebug("size: %d, alloc %p", m_accel_allocation);
+               eDebug("size: %d, alloc %p", size, m_accel_allocation);
                addr = 0;
                phys_addr = 0;
                return -1;
@@ -98,6 +140,21 @@ int gAccel::accelAlloc(void *&addr, int &phys_addr, int size)
        
        size += 4095; size >>= 12;
        int i;
+       
+       int used = 0, free = 0, s = 0;
+       for (i=0; i < m_accel_size; ++i)
+       {
+               if (m_accel_allocation[i] == 0)
+                       free++;
+               else if (m_accel_allocation[i] == -1)
+                       used++;
+               else
+               {
+                       used++;
+                       s += m_accel_allocation[i];
+               }
+       }
+       eDebug("accel memstat: used=%d kB, free %d kB, s %d kB", used * 4, free * 4, s * 4);
 
        for (i=0; i < m_accel_size - size; ++i)
        {
@@ -107,7 +164,7 @@ int gAccel::accelAlloc(void *&addr, int &phys_addr, int size)
                                break;
                if (a == size)
                {
-                       m_accel_allocation[i+a] = size;
+                       m_accel_allocation[i] = size;
                        for (a=1; a<size; ++a)
                                m_accel_allocation[i+a] = -1;
                        addr = ((unsigned char*)m_accel_addr) + (i << 12);
@@ -115,6 +172,7 @@ int gAccel::accelAlloc(void *&addr, int &phys_addr, int size)
                        return 0;
                }
        }
+       eDebug("accel alloc failed\n");
        return -1;
 }