summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/tcc780x
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-12-16 23:40:39 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-12-16 23:40:39 +0000
commit95e6043d5e256df72c20db39c3be59a3ba977b19 (patch)
tree20a86cd626c43e92436459b6a408c4a13f4c21ef /firmware/target/arm/tcc780x
parent13b2f5381310bc4e58d34f8dac0c8b9bdbd736d2 (diff)
downloadrockbox-95e6043d5e256df72c20db39c3be59a3ba977b19.tar.gz
rockbox-95e6043d5e256df72c20db39c3be59a3ba977b19.zip
Convert remaining memframe LCDs that can be convert to common code.
Massage the way it interfaces a bit to make things more flexible. The chroma_buf scheme on Sansa Connect and Creative ZVx calling the lcd_write_yuv420_lines implementation in lcd-as-memframe.S with five params with a chroma buffer that the function can't use wouldn't work anyway so just have them use the stock implementation (really, how was that working?). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31335 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tcc780x')
-rw-r--r--firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c147
-rw-r--r--firmware/target/arm/tcc780x/cowond2/lcd-target.h28
2 files changed, 34 insertions, 141 deletions
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
index ab50769983..b4c37b716c 100644
--- a/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-cowond2.c
@@ -24,9 +24,12 @@
#include "hwcompat.h"
#include "kernel.h"
#include "lcd.h"
+#include "lcd-target.h"
#include "system.h"
#include "cpu.h"
+extern bool lcd_on; /* lcd-memframe.c */
+
/* GPIO A pins for LCD panel SDI interface */
#define LTV250QV_CS (1<<24)
@@ -51,11 +54,6 @@
#define LCDC_I1OFF (*(volatile unsigned long *)0xF00000A8)
#define LCDC_I1SCALE (*(volatile unsigned long *)0xF00000AC)
-/* Power and display status */
-static bool display_on = false; /* Is the display turned on? */
-
-static unsigned lcd_yuv_options = 0;
-
/* Framebuffer copy as seen by the hardware */
fb_data lcd_driver_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH];
@@ -180,13 +178,13 @@ static void lcd_display_on(void)
udelay(10000);
/* tell that we're on now */
- display_on = true;
+ lcd_on = true;
}
static void lcd_display_off(void)
{
/* block drawing operations and changing of first */
- display_on = false;
+ lcd_on = false;
/* LQV shutdown sequence */
lcd_write_reg(9, 0x55);
@@ -204,7 +202,7 @@ static void lcd_display_off(void)
void lcd_enable(bool on)
{
- if (on == display_on)
+ if (on == lcd_on)
return;
if (on)
@@ -221,11 +219,6 @@ void lcd_enable(bool on)
}
}
-bool lcd_active(void)
-{
- return display_on;
-}
-
/* TODO: implement lcd_sleep() and separate out the power on/off functions */
void lcd_init_device(void)
@@ -278,67 +271,6 @@ void lcd_init_device(void)
/*** Update 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) ICODE_ATTR;
-void lcd_update(void)
-{
- if (!display_on)
- return;
-
- lcd_copy_buffer_rect(&lcd_driver_framebuffer[0][0],
- &lcd_framebuffer[0][0], LCD_WIDTH*LCD_HEIGHT, 1);
-}
-
-/* Update a fraction of the display. */
-void lcd_update_rect(int, int, int, int) ICODE_ATTR;
-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 */
-
- /* TODO: It may be faster to swap the addresses of lcd_driver_framebuffer
- * and lcd_framebuffer */
- 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_set_flip(bool yesno)
{
// TODO
@@ -350,70 +282,3 @@ void lcd_set_invert_display(bool yesno)
// TODO
(void)yesno;
}
-
-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 */
-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;
-
- fb_data *dst = &lcd_driver_framebuffer[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*LCD_FBWIDTH;
- 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*LCD_FBWIDTH;
- }
- while (--height > 0);
- }
-}
diff --git a/firmware/target/arm/tcc780x/cowond2/lcd-target.h b/firmware/target/arm/tcc780x/cowond2/lcd-target.h
new file mode 100644
index 0000000000..52caf34a45
--- /dev/null
+++ b/firmware/target/arm/tcc780x/cowond2/lcd-target.h
@@ -0,0 +1,28 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Rob Purchase
+ *
+ * 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 */