len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

e200v2: fix broken lcd driver and cleanup a little bit further.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20063 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-02-20 15:10:49 +00:00
parent 2088ce9117
commit f6f426eda4
1 changed files with 30 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

67
firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
View file

@ -179,6 +179,15 @@ void lcd_set_flip(bool yesno)
flip_lcd(yesno); flip_lcd(yesno);
} }
static void lcd_window(int xmin, int ymin, int xmax, int ymax)
{
ymin += y_offset;
ymax += y_offset;
lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (xmax << 8) | xmin);
lcd_write_reg(R_VERT_RAM_ADDR_POS, (ymax << 8) | ymin);
lcd_write_reg(R_RAM_ADDR_SET, (ymin << 8) | xmin);
}
static void _display_on(void) static void _display_on(void)
{ {
/* Initialisation the display the same way as the original firmware */ /* Initialisation the display the same way as the original firmware */
@ -269,16 +278,12 @@ static void _display_on(void)
lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0x0f08); lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0x0f08);
lcd_write_reg(R_RAM_ADDR_SET, 0);
lcd_write_reg(R_GATE_SCAN_POS, 0); lcd_write_reg(R_GATE_SCAN_POS, 0);
lcd_write_reg(R_VERT_SCROLL_CONTROL, 0); lcd_write_reg(R_VERT_SCROLL_CONTROL, 0);
lcd_write_reg(R_1ST_SCR_DRV_POS, 219 << 8); lcd_window(0, 0, LCD_WIDTH-1, LCD_HEIGHT-1);
lcd_write_reg(R_2ND_SCR_DRV_POS, 219 << 8); lcd_write_reg(R_1ST_SCR_DRV_POS, (LCD_HEIGHT-1) << 8);
lcd_write_reg(R_2ND_SCR_DRV_POS, (LCD_HEIGHT-1) << 8);
lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 175 << 8);
lcd_write_reg(R_VERT_RAM_ADDR_POS, 219 << 8);
lcd_write_reg(R_DISP_CONTROL1, 0x0037); lcd_write_reg(R_DISP_CONTROL1, 0x0037);
@ -363,18 +368,6 @@ void lcd_blit_yuv(unsigned char * const src[3],
(void)height; (void)height;
} }
static void lcd_window_x(int xmin, int xmax)
{
lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (xmax << 8) | xmin);
}
static void lcd_window_y(int ymin, int ymax)
{
ymin += y_offset;
ymax += y_offset;
lcd_write_reg(R_VERT_RAM_ADDR_POS, (ymax << 8) | ymin);
lcd_write_reg(R_RAM_ADDR_SET, ymin << 8);
}
/* Update the display. /* Update the display.
This must be called after all other LCD functions that change the display. */ This must be called after all other LCD functions that change the display. */
void lcd_update(void) void lcd_update(void)
@ -386,8 +379,7 @@ void lcd_update(void)
lcd_busy = true; lcd_busy = true;
/* Set start position and window */ /* Set start position and window */
lcd_window_x(0, LCD_WIDTH-1); lcd_window(0, 0, LCD_WIDTH-1, LCD_HEIGHT-1);
lcd_window_x(0, LCD_HEIGHT-1);
lcd_write_cmd(R_WRITE_DATA_2_GRAM); lcd_write_cmd(R_WRITE_DATA_2_GRAM);
@ -401,34 +393,36 @@ void lcd_update(void)
void lcd_update_rect(int x, int y, int width, int height) void lcd_update_rect(int x, int y, int width, int height)
{ {
const fb_data *ptr; const fb_data *ptr;
int ymax; int ymax, xmax;
if (!display_on) if (!display_on)
return; return;
if (x + width >= LCD_WIDTH) xmax = x + width;
width = LCD_WIDTH - x -1; /* Clip right */ if (xmax >= LCD_WIDTH)
xmax = LCD_WIDTH - 1; /* Clip right */
if (x < 0) if (x < 0)
width += x, x = 0; /* Clip left */ x = 0; /* Clip left */
if (width <= 0) if (x >= xmax)
return; /* nothing left to do */ return; /* nothing left to do */
if (y + height >= LCD_HEIGHT) width = xmax - x + 1; /* Fix width */
height = LCD_HEIGHT - y - 1; /* Clip bottom */
ymax = y + height;
if (ymax >= LCD_HEIGHT)
ymax = LCD_HEIGHT - 1; /* Clip bottom */
if (y < 0) if (y < 0)
height += y; y = 0; /* Clip top */ y = 0; /* Clip top */
if (height <= 0) if (y >= ymax)
return; /* nothing left to do */ return; /* nothing left to do */
ymax = y+height;
lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
lcd_busy = true; lcd_busy = true;
lcd_window(x, y, xmax, ymax);
lcd_write_cmd(R_WRITE_DATA_2_GRAM); lcd_write_cmd(R_WRITE_DATA_2_GRAM);
lcd_window_x(x, x + width);
lcd_window_y(y, ymax);
ptr = &lcd_framebuffer[y][x]; ptr = (fb_data*)&lcd_framebuffer[y][x];
do do
{ {
@ -450,8 +444,7 @@ bool lcd_button_support(void)
lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
/* Set start position and window */ /* Set start position and window */
lcd_window_x(LCD_WIDTH+1, 1); lcd_window(LCD_WIDTH+1, LCD_HEIGHT+1, LCD_WIDTH+2, LCD_HEIGHT+2);
lcd_window_y(LCD_HEIGHT+1, 1);
lcd_write_cmd(R_WRITE_DATA_2_GRAM); lcd_write_cmd(R_WRITE_DATA_2_GRAM);