Collect some of the memory frame LCD C code.

For this commit: Sansa e200v1, Gigabeat F, Gigabeat S and Mini2440 are
changed over. Quite a number of other targets probably can be as well.

General LCD code is moved out of the target drivers into
drivers/lcd-memframe.c.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31311 a1c6a512-1295-4272-9138-f99709370657

firmware/SOURCES

@@ -791,6 +791,7 @@ target/sh/archos/ondio/fmradio_i2c-ondio.c
 #endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */
 
 #if defined(SANSA_E200) || defined(SANSA_C200)
+drivers/lcd-memframe.c
 target/arm/ata-sd-pp.c
 target/arm/i2s-pp.c
 target/arm/usb-fw-pp502x.c
@@ -998,6 +999,7 @@ target/arm/iriver/h10/lcd-h10_5gb.c
 #endif /* IRIVER_H10_5GB */
 
 #ifdef GIGABEAT_F
+drivers/lcd-memframe.c
 target/arm/bits-armv4.S
 target/arm/lcd-as-memframe.S
 target/arm/mmu-arm.S
@@ -1015,6 +1017,7 @@ target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
 #endif /* GIGABEAT_F */
 
 #ifdef GIGABEAT_S
+drivers/lcd-memframe.c
 target/arm/bits-armv6.S
 target/arm/lcd-as-memframe.S
 target/arm/mmu-armv6.S
@@ -1605,6 +1608,7 @@ target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
 #endif
 
 #if defined(MINI2440)
+drivers/lcd-memframe.c
 target/arm/bits-armv4.S
 target/arm/lcd-as-memframe.S
 target/arm/mmu-arm.S

firmware/drivers/lcd-memframe.c

@@ -0,0 +1,173 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (c) 2007, 2011 Michael Sevakis
+ *
+ * Shared C code for memory framebuffer LCDs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include <sys/types.h> /* off_t */
+#include "config.h"
+#include "system.h"
+#include "lcd.h"
+#include "lcd-target.h"
+
+/*** Misc. functions ***/
+
+static bool lcd_on SHAREDBSS_ATTR = false; /* Is the display turned on? */
+
+bool lcd_active(void)
+{
+    return lcd_on;
+}
+
+/* For use by target driver only! */
+void lcd_set_active(bool active)
+{
+    lcd_on = active;
+}
+
+/*** Blitting functions ***/
+
+/* Copies a rectangle from one framebuffer to another. Can be used in
+   single transfer mode with width = num pixels, and height = 1 which
+   allows a full-width rectangle to be copied more efficiently. */
+extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
+                                 int width, int height);
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void)
+{
+    if (!lcd_on)
+        return;
+
+    /* Copy the Rockbox framebuffer to the second framebuffer */
+    lcd_copy_buffer_rect(LCD_FRAMEBUF_ADDR(0, 0), &lcd_framebuffer[0][0],
+                         LCD_WIDTH*LCD_HEIGHT, 1);
+}
+
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    fb_data *dst, *src;
+
+    if (!lcd_on)
+        return;
+
+    if (x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x; /* Clip right */
+    if (x < 0)
+        width += x, x = 0; /* Clip left */
+    if (width <= 0)
+        return; /* nothing left to do */
+
+    if (y + height > LCD_HEIGHT)
+        height = LCD_HEIGHT - y; /* Clip bottom */
+    if (y < 0)
+        height += y, y = 0; /* Clip top */
+    if (height <= 0)
+        return; /* nothing left to do */
+
+    dst = LCD_FRAMEBUF_ADDR(x, y);
+    src = &lcd_framebuffer[y][x];
+
+    /* Copy part of the Rockbox framebuffer to the second framebuffer */
+    if (width < LCD_WIDTH)
+    {
+        /* Not full width - do line-by-line */
+        lcd_copy_buffer_rect(dst, src, width, height);
+    }
+    else
+    {
+        /* Full width - copy as one line */
+        lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1);
+    }
+}
+
+
+/*** YUV functions ***/
+static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0;
+
+
+/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */
+extern void lcd_write_yuv420_lines(fb_data *dst,
+                                   unsigned char const * const src[3],
+                                   int width,
+                                   int stride);
+extern void lcd_write_yuv420_lines_odither(fb_data *dst,
+                                           unsigned char const * const src[3],
+                                           int width,
+                                           int stride,
+                                           int x_screen, /* To align dither pattern */
+                                           int y_screen);
+
+void lcd_yuv_set_options(unsigned options)
+{
+    lcd_yuv_options = options;
+}
+
+/* Performance function to blit a YUV bitmap directly to the LCD */
+/* For the e200 - show it rotated */
+/* So the LCD_WIDTH is now the height */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    unsigned char const * yuv_src[3];
+    off_t z;
+
+    if (!lcd_on)
+        return;
+
+    /* Sorry, but width and height must be >= 2 or else */
+    width &= ~1;
+    height >>= 1;
+
+    y = LCD_WIDTH - 1 - y;
+    fb_data *dst = LCD_FRAMEBUF_ADDR(y, x);
+
+    z = stride*src_y;
+    yuv_src[0] = src[0] + z + src_x;
+    yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1);
+    yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
+
+    if (lcd_yuv_options & LCD_YUV_DITHER)
+    {
+        do
+        {
+            lcd_write_yuv420_lines_odither(dst, yuv_src, width, stride, y, x);
+            yuv_src[0] += stride << 1; /* Skip down two luma lines */
+            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
+            yuv_src[2] += stride >> 1;
+            dst -= 2;
+            y -= 2;
+        }
+        while (--height > 0);
+    }
+    else
+    {
+        do
+        {
+            lcd_write_yuv420_lines(dst, yuv_src, width, stride);
+            yuv_src[0] += stride << 1; /* Skip down two luma lines */
+            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
+            yuv_src[2] += stride >> 1;
+            dst -= 2;
+        }
+        while (--height > 0);
+    }
+}

firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c

@@ -18,32 +18,20 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include <sys/types.h>
-#include "inttypes.h"
-
 #include "config.h"
 #include "system.h"
-#include "cpu.h"
-#include "spi-imx31.h"
-#include "mc13783.h"
-#include "string.h"
 #include "lcd.h"
-#include "kernel.h"
 #include "lcd-target.h"
 #include "backlight-target.h"
+#include "spi-imx31.h"
+#include "mc13783.h"
+
+extern void lcd_set_active(bool active);
 
 #define MAIN_LCD_IDMAC_CHANNEL 14
-#define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)])
 
-/* Copies a rectangle from one framebuffer to another. Can be used in
-   single transfer mode with width = num pixels, and height = 1 which
-   allows a full-width rectangle to be copied more efficiently. */
-extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
-                                 int width, int height);
-
-static bool lcd_on = true;
 static bool lcd_powered = true;
-static unsigned lcd_yuv_options = 0;
+
 /* Settings shadow regs */
 #ifdef HAVE_LCD_CONTRAST
 static uint8_t reg0x0b = 0x2f;
@@ -184,44 +172,6 @@ void INIT_ATTR lcd_init_device(void)
     lcd_sync_settings();
 }
 
-/* Update a fraction of the display. */
-void lcd_update_rect(int x, int y, int width, int height)
-{
-    fb_data *dst, *src;
-
-    if (!lcd_on)
-        return;
-
-    if (x + width > LCD_WIDTH)
-        width = LCD_WIDTH - x; /* Clip right */
-    if (x < 0)
-        width += x, x = 0; /* Clip left */
-    if (width <= 0)
-        return; /* nothing left to do */
-
-    if (y + height > LCD_HEIGHT)
-        height = LCD_HEIGHT - y; /* Clip bottom */
-    if (y < 0)
-        height += y, y = 0; /* Clip top */
-    if (height <= 0)
-        return; /* nothing left to do */
-
-    dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
-    src = &lcd_framebuffer[y][x];
-
-    /* Copy part of the Rockbox framebuffer to the second framebuffer */
-    if (width < LCD_WIDTH)
-    {
-        /* Not full width - do line-by-line */
-        lcd_copy_buffer_rect(dst, src, width, height);
-    }
-    else
-    {
-        /* Full width - copy as one line */
-        lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1);
-    }
-}
-
 void lcd_sleep(void)
 {
     if (!lcd_powered)
@@ -235,7 +185,7 @@ void lcd_sleep(void)
 
 void lcd_enable(bool state)
 {
-    if (state == lcd_on)
+    if (state == lcd_active())
         return;
 
     if (state)
@@ -245,99 +195,13 @@ void lcd_enable(bool state)
         IPU_IDMAC_CHA_EN |= 1ul << MAIN_LCD_IDMAC_CHANNEL;
         lcd_sync_settings();
         sleep(HZ/50);
-        lcd_on = true;
+        lcd_set_active(true);
         lcd_update();
         send_event(LCD_EVENT_ACTIVATION, NULL);
     }
     else
     {
-        lcd_on = false;
+        lcd_set_active(false);
-    }
-}
-
-bool lcd_active(void)
-{
-    return lcd_on;
-}
-
-/* Update the display.
-   This must be called after all other LCD functions that change the display. */
-void lcd_update(void)
-{
-    if (!lcd_on)
-        return;
-
-    lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
-                         LCD_WIDTH*LCD_HEIGHT, 1);
-}
-
-void lcd_yuv_set_options(unsigned options)
-{
-    lcd_yuv_options = options;
-}
-
-/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */
-extern void lcd_write_yuv420_lines(fb_data *dst,
-                                   unsigned char const * const src[3],
-                                   int width,
-                                   int stride);
-extern void lcd_write_yuv420_lines_odither(fb_data *dst,
-                                           unsigned char const * const src[3],
-                                           int width,
-                                           int stride,
-                                           int x_screen, /* To align dither pattern */
-                                           int y_screen);
-/* Performance function to blit a YUV bitmap directly to the LCD */
-/* For the Gigabeat - show it rotated */
-/* So the LCD_WIDTH is now the height */
-void lcd_blit_yuv(unsigned char * const src[3],
-                  int src_x, int src_y, int stride,
-                  int x, int y, int width, int height)
-{
-    /* Caches for chroma data so it only need be recaculated every other
-       line */
-    unsigned char const * yuv_src[3];
-    off_t z;
-
-    if (!lcd_on)
-        return;
-
-    /* Sorry, but width and height must be >= 2 or else */
-    width &= ~1;
-    height >>= 1;
-
-    y = LCD_WIDTH - 1 - y;
-    fb_data *dst = (fb_data*)FRAME + x * LCD_WIDTH + y;
-
-    z = stride*src_y;
-    yuv_src[0] = src[0] + z + src_x;
-    yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1);
-    yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
-
-    if (lcd_yuv_options & LCD_YUV_DITHER)
-    {
-        do
-        {
-            lcd_write_yuv420_lines_odither(dst, yuv_src, width, stride, y, x);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-            y -= 2;
-        }
-        while (--height > 0);
-    }
-    else
-    {
-        do
-        {
-            lcd_write_yuv420_lines(dst, yuv_src, width, stride);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-        }
-        while (--height > 0);
     }
 }
 
@@ -346,7 +210,7 @@ void lcd_set_contrast(int val)
 {
     reg0x0b = val & 0x3f;
 
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     lcd_write_reg(0x0b, reg0x0b);
@@ -363,7 +227,7 @@ void lcd_set_invert_display(bool yesno)
 {
     reg0x27 = yesno ? 0x10 : 0x00;
 
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     lcd_write_reg(0x27, reg0x27);
@@ -375,7 +239,7 @@ void lcd_set_flip(bool yesno)
 {
     reg0x06 = yesno ? 0x02 : 0x04;
 
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     lcd_write_reg(0x06, reg0x06);

firmware/target/arm/imx31/gigabeat-s/lcd-target.h

@@ -21,8 +21,6 @@
 #ifndef LCD_TARGET_H
 #define LCD_TARGET_H
 
-#if 0
+#define LCD_FRAMEBUF_ADDR(col, row) ((fb_data *)FRAME + (row)*LCD_WIDTH + (col))
-void lcd_enable(bool state);
-#endif
 
 #endif /* LCD_TARGET_H */

firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h

@@ -18,8 +18,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#ifndef LCD_TARGET_H
+#define LCD_TARGET_H
 
-extern void lcd_enable(bool state);
+#define LCD_FRAMEBUF_ADDR(col, row) ((fb_data *)FRAME + (row)*LCD_WIDTH + (col))
 
 /* Config values for LCDCON1 */
 /* ENVID = 0, BPPMODE = 16 bpp, PNRMODE = TFT, MMODE = Each Frame, CLKVAL = 8 */
@@ -43,3 +45,5 @@ extern void lcd_enable(bool state);
 /* Config values for LCDCON4 */
 /* HSPW = 7 */
 #define LCD_HSYNC_LEN 7
+
+#endif /* LCD_TARGET_H */

firmware/target/arm/s3c2440/lcd-s3c2440.c

@@ -19,36 +19,16 @@
 * KIND, either express or implied.
 *
 ****************************************************************************/ 
-#include <sys/types.h> /* off_t */
-
 #include "config.h"
 #include "system.h"
-#include "cpu.h"
-#include "string.h"
 #include "lcd.h"
-#include "kernel.h"
 #include "lcd-target.h"
 
-#define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)])
+extern void lcd_set_active(bool active);
 
-static bool lcd_on = true;
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
 static bool lcd_powered = true;
 #endif
-static unsigned lcd_yuv_options = 0;
-
-/* Copies a rectangle from one framebuffer to another. Can be used in
-   single transfer mode with width = num pixels, and height = 1 which
-   allows a full-width rectangle to be copied more efficiently. */
-extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
-                                 int width, int height);
-
-#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
-bool lcd_active(void)
-{
-    return lcd_on;
-}
-#endif
 
 static unsigned int LCDBANK(unsigned int address)
 {
@@ -281,7 +261,7 @@ void lcd_sleep(void)
     if (lcd_powered)
     {
         /* "not powered" implies "disabled" */
-        if (lcd_on)
+        if (!lcd_active())
             lcd_enable(false);
 
         LCD_SPI_powerdown();
@@ -303,7 +283,7 @@ static void LCD_SPI_powerup(void)
 
 void lcd_enable(bool state)
 {
-    if (state == lcd_on)
+    if (state == lcd_active())
         return;
 
     if(state)
@@ -317,20 +297,20 @@ void lcd_enable(bool state)
             sleep(HZ/5);
         }
 
-        lcd_on = true;
+        lcd_set_active(true);
         lcd_update();
         send_event(LCD_EVENT_ACTIVATION, NULL);
     }
     else
     {
-        lcd_on = false;
+        lcd_set_active(false);
     }
 }
 #endif
 
 #ifdef GIGABEAT_F
 void lcd_set_flip(bool yesno) {
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     LCD_SPI_start();
@@ -351,7 +331,7 @@ int lcd_default_contrast(void)
 }
 
 void lcd_set_contrast(int val) {
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     LCD_SPI_start();
@@ -360,7 +340,7 @@ void lcd_set_contrast(int val) {
 }
 
 void lcd_set_invert_display(bool yesno) {
-    if (!lcd_on)
+    if (!lcd_active())
         return;
 
     LCD_SPI_start();
@@ -399,125 +379,3 @@ void lcd_set_invert_display(bool yesno)
 }
 
 #endif
-
-/* Update a fraction of the display. */
-void lcd_update_rect(int x, int y, int width, int height)
-{
-    fb_data *dst, *src;
-
-    if (!lcd_on)
-        return;
-
-    if (x + width > LCD_WIDTH)
-        width = LCD_WIDTH - x; /* Clip right */
-    if (x < 0)
-        width += x, x = 0; /* Clip left */
-    if (width <= 0)
-        return; /* nothing left to do */
-
-    if (y + height > LCD_HEIGHT)
-        height = LCD_HEIGHT - y; /* Clip bottom */
-    if (y < 0)
-        height += y, y = 0; /* Clip top */
-    if (height <= 0)
-        return; /* nothing left to do */
-
-    /* TODO: It may be faster to swap the addresses of lcd_driver_framebuffer
-     * and lcd_framebuffer */
-    dst = (fb_data *)FRAME + LCD_WIDTH*y + x;
-    src = &lcd_framebuffer[y][x];
-
-    /* Copy part of the Rockbox framebuffer to the second framebuffer */
-    if (width < LCD_WIDTH)
-    {
-        /* Not full width - do line-by-line */
-        lcd_copy_buffer_rect(dst, src, width, height);
-    }
-    else
-    {
-        /* Full width - copy as one line */
-        lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1);
-    }
-}
-
-/* Update the display.
-   This must be called after all other LCD functions that change the display. */
-void lcd_update(void)
-{
-    if (!lcd_on)
-        return;
-
-    lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0],
-                         LCD_WIDTH*LCD_HEIGHT, 1);
-}
-
-void lcd_yuv_set_options(unsigned options)
-{
-    lcd_yuv_options = options;
-}
-
-/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */
-extern void lcd_write_yuv420_lines(fb_data *dst,
-                                   unsigned char const * const src[3],
-                                   int width,
-                                   int stride);
-extern void lcd_write_yuv420_lines_odither(fb_data *dst,
-                                           unsigned char const * const src[3],
-                                           int width,
-                                           int stride,
-                                           int x_screen, /* To align dither pattern */
-                                           int y_screen);
-/* Performance function to blit a YUV bitmap directly to the LCD */
-/* For the Gigabeat - show it rotated */
-/* So the LCD_WIDTH is now the height */
-void lcd_blit_yuv(unsigned char * const src[3],
-                  int src_x, int src_y, int stride,
-                  int x, int y, int width, int height)
-{
-    /* Caches for chroma data so it only need be recaculated every other
-       line */
-    unsigned char const * yuv_src[3];
-    off_t z;
-
-    if (!lcd_on)
-        return;
-
-    /* Sorry, but width and height must be >= 2 or else */
-    width &= ~1;
-    height >>= 1;
-
-    y = LCD_WIDTH - 1 - y;
-    fb_data *dst = (fb_data*)FRAME + x * LCD_WIDTH + y;
-
-    z = stride*src_y;
-    yuv_src[0] = src[0] + z + src_x;
-    yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1);
-    yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
-
-    if (lcd_yuv_options & LCD_YUV_DITHER)
-    {
-        do
-        {
-            lcd_write_yuv420_lines_odither(dst, yuv_src, width, stride, y, x);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-            y -= 2;
-        }
-        while (--height > 0);
-    }
-    else
-    {
-        do
-        {
-            lcd_write_yuv420_lines(dst, yuv_src, width, stride);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-        }
-        while (--height > 0);
-    }
-}
-

firmware/target/arm/s3c2440/mini2440/lcd-target.h

@@ -18,8 +18,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#ifndef LCD_TARGET_H
+#define LCD_TARGET_H
 
-extern void lcd_enable(bool state);
+#define LCD_FRAMEBUF_ADDR(col, row) ((fb_data *)FRAME + (row)*LCD_WIDTH + (col))
 
 /* Setup for Mini2440, 3.5" TFT LCD Touchscreen */
 
@@ -41,3 +43,5 @@ extern void lcd_enable(bool state);
 
 /* Config values for LCDCON4 */
 #define LCD_HSYNC_LEN 4
+
+#endif /* LCD_TARGET_H */

firmware/target/arm/sandisk/sansa-e200/lcd-e200.c

@@ -22,17 +22,15 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include <sys/types.h> /* off_t */
+#include "config.h"
-#include <string.h>
-#include "cpu.h"
 #include "system.h"
-#include "backlight-target.h"
 #include "lcd.h"
+#include "lcd-target.h"
+
+extern void lcd_set_active(bool active);
 
 /* Power and display status */
 static bool power_on   = false; /* Is the power turned on?   */
-static bool display_on SHAREDBSS_ATTR = false; /* Is the display turned on? */
-static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0;
 
 /* Reverse Flag */
 #define R_DISP_CONTROL_NORMAL 0x0004
@@ -112,7 +110,7 @@ static unsigned short r_drv_output_control  = R_DRV_OUTPUT_CONTROL_NORMAL;
 /* We don't know how to receive a DMA finished signal from the LCD controller.
  * To avoid problems with flickering, we double-buffer the framebuffer.
  * Align as in lcd-16bit.c and not cached. */
-static fb_data lcd_driver_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH]
+fb_data lcd_driver_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH]
     __attribute__((aligned(16))) NOCACHEBSS_ATTR;
 
 #ifdef BOOTLOADER
@@ -310,21 +308,16 @@ static void lcd_display_on(void)
     lcd_send_msg(0x70, R_RAM_WRITE_DATA);
 
     /* tell that we're on now */
-    display_on = true;
+    lcd_set_active(true);
 }
 
 
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
-bool lcd_active(void)
-{
-    return display_on;
-}
-
 /* Turn off visible display operations */
 static void lcd_display_off(void)
 {
     /* block drawing operations and changing of first */
-    display_on = false;
+    lcd_set_active(false);
 
     /* NO2-0=01, SDT1-0=00, EQ1-0=00, DIV1-0=00, RTN3-0=0000 */
     lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x4000);
@@ -428,7 +421,7 @@ void lcd_init_device(void)
     LCD_FB_BASE_REG = (long)lcd_driver_framebuffer;
 
     power_on = true;
-    display_on = true;
+    lcd_set_active(true);
 
     lcd_set_invert_display(false);
     lcd_set_flip(false);
@@ -440,7 +433,7 @@ void lcd_init_device(void)
 #if defined(HAVE_LCD_ENABLE)
 void lcd_enable(bool on)
 {
-    if (on == display_on)
+    if (on == lcd_active())
         return;
 
     if (on)
@@ -471,7 +464,7 @@ void lcd_sleep(void)
     if (power_on)
     {
         /* Turn off display */
-        if (display_on)
+        if (lcd_active())
             lcd_display_off();
 
         power_on = false;
@@ -483,59 +476,6 @@ void lcd_sleep(void)
 }
 #endif
 
-/* Copies a rectangle from one framebuffer to another. Can be used in
-   single transfer mode with width = num pixels, and height = 1 which
-   allows a full-width rectangle to be copied more efficiently. */
-extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
-                                 int width, int height);
-void lcd_update_rect(int x, int y, int width, int height)
-{
-    fb_data *dst, *src;
-
-    if (!display_on)
-        return;
-
-    if (x + width > LCD_WIDTH)
-        width = LCD_WIDTH - x; /* Clip right */
-    if (x < 0)
-        width += x, x = 0; /* Clip left */
-    if (width <= 0)
-        return; /* nothing left to do */
-
-    if (y + height > LCD_HEIGHT)
-        height = LCD_HEIGHT - y; /* Clip bottom */
-    if (y < 0)
-        height += y, y = 0; /* Clip top */
-    if (height <= 0)
-        return; /* nothing left to do */
-
-    dst = &lcd_driver_framebuffer[y][x];
-    src = &lcd_framebuffer[y][x];
-
-    /* Copy part of the Rockbox framebuffer to the second framebuffer */
-    if (width < LCD_WIDTH)
-    {
-        /* Not full width - do line-by-line */
-        lcd_copy_buffer_rect(dst, src, width, height);
-    }
-    else
-    {
-        /* Full width - copy as one line */
-        lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1);
-    }
-}
-
-void lcd_update(void)
-{
-    if (!display_on)
-        return;
-
-    /* Copy the Rockbox framebuffer to the second framebuffer */
-    lcd_copy_buffer_rect(&lcd_driver_framebuffer[0][0],
-                         &lcd_framebuffer[0][0], LCD_WIDTH*LCD_HEIGHT, 1);
-}
-
-
 /*** hardware configuration ***/
 
 void lcd_set_contrast(int val)
@@ -558,7 +498,7 @@ void lcd_set_invert_display(bool yesno)
     r_disp_control_rev = yesno ? R_DISP_CONTROL_REV :
                                  R_DISP_CONTROL_NORMAL;
 
-    if (display_on)
+    if (lcd_active())
     {
         /* PT1-0=00, VLE2-1=00, SPT=0, IB6(??)=1, GON=1, CL=0,
            DTE=1, REV=x, D1-0=11 */
@@ -602,73 +542,3 @@ void lcd_set_flip(bool yesno)
         LCD_REG_6 |= 1;    /* Restart DMA */
     }
 }
-
-/* Blitting functions */
-
-void lcd_yuv_set_options(unsigned options)
-{
-    lcd_yuv_options = options;
-}
-
-/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */
-extern void lcd_write_yuv420_lines(fb_data *dst,
-                                   unsigned char const * const src[3],
-                                   int width,
-                                   int stride);
-extern void lcd_write_yuv420_lines_odither(fb_data *dst,
-                                           unsigned char const * const src[3],
-                                           int width,
-                                           int stride,
-                                           int x_screen, /* To align dither pattern */
-                                           int y_screen);
-/* Performance function to blit a YUV bitmap directly to the LCD */
-/* For the e200 - show it rotated */
-/* So the LCD_WIDTH is now the height */
-void lcd_blit_yuv(unsigned char * const src[3],
-                  int src_x, int src_y, int stride,
-                  int x, int y, int width, int height)
-{
-    unsigned char const * yuv_src[3];
-    off_t z;
-
-    if (!display_on)
-        return;
-
-    /* Sorry, but width and height must be >= 2 or else */
-    width &= ~1;
-    height >>= 1;
-
-    y = LCD_WIDTH - 1 - y;
-    fb_data *dst = &lcd_driver_framebuffer[x][y];
-
-    z = stride*src_y;
-    yuv_src[0] = src[0] + z + src_x;
-    yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1);
-    yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
-
-    if (lcd_yuv_options & LCD_YUV_DITHER)
-    {
-        do
-        {
-            lcd_write_yuv420_lines_odither(dst, yuv_src, width, stride, y, x);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-            y -= 2;
-        }
-        while (--height > 0);
-    }
-    else
-    {
-        do
-        {
-            lcd_write_yuv420_lines(dst, yuv_src, width, stride);
-            yuv_src[0] += stride << 1; /* Skip down two luma lines */
-            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
-            yuv_src[2] += stride >> 1;
-            dst -= 2;
-        }
-        while (--height > 0);
-    }
-}

firmware/target/arm/sandisk/sansa-e200/lcd-target.h

@@ -0,0 +1,28 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 Michael Sevakis
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef LCD_TARGET_H
+#define LCD_TARGET_H
+
+extern fb_data lcd_driver_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH];
+
+#define LCD_FRAMEBUF_ADDR(col, row) (&lcd_driver_framebuffer[row][col])
+
+#endif /* LCD_TARGET_H */