From 62facd1ff233a4734e4bc3d616ac22c5c56f926c Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Thu, 15 Dec 2011 23:07:11 +0000 Subject: 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 --- .../target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c | 158 ++------------------- 1 file changed, 11 insertions(+), 147 deletions(-) (limited to 'firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c') diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c index 6a0c889851..8185479390 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c @@ -18,32 +18,20 @@ * KIND, either express or implied. * ****************************************************************************/ -#include -#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" -#define MAIN_LCD_IDMAC_CHANNEL 14 -#define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) +extern void lcd_set_active(bool active); -/* 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); +#define MAIN_LCD_IDMAC_CHANNEL 14 -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; - } -} - -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); + lcd_set_active(false); } } @@ -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); -- cgit v1.2.3