summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/s3c2440
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-12-15 23:07:11 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-12-15 23:07:11 +0000
commit62facd1ff233a4734e4bc3d616ac22c5c56f926c (patch)
tree95d22b472e7ec548fbb0c239de7bd4e657437b88 /firmware/target/arm/s3c2440
parentf53b8ff959ee4443593569440403229108e26b3d (diff)
downloadrockbox-62facd1ff233a4734e4bc3d616ac22c5c56f926c.tar.gz
rockbox-62facd1ff233a4734e4bc3d616ac22c5c56f926c.tar.bz2
rockbox-62facd1ff233a4734e4bc3d616ac22c5c56f926c.zip
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
Diffstat (limited to 'firmware/target/arm/s3c2440')
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h6
-rw-r--r--firmware/target/arm/s3c2440/lcd-s3c2440.c158
-rw-r--r--firmware/target/arm/s3c2440/mini2440/lcd-target.h6
3 files changed, 18 insertions, 152 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
index c136a2052d..d5656f6d45 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
+++ b/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 */
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c
index 77be29f556..cbf4784064 100644
--- a/firmware/target/arm/s3c2440/lcd-s3c2440.c
+++ b/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);
- }
-}
-
diff --git a/firmware/target/arm/s3c2440/mini2440/lcd-target.h b/firmware/target/arm/s3c2440/mini2440/lcd-target.h
index b2882e2390..97643f8163 100644
--- a/firmware/target/arm/s3c2440/mini2440/lcd-target.h
+++ b/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 */