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

Make the Fuze usable again by inserting a few delays in the lcd functions, core rockbox should be fine now. NOTE: *After exiting* plugins (e.g. doom, plasma, pictureflow) which do heavy lcd updates, the Fuze still fails (backlight goes off) -- I have no idea how that happens yet, Unless I find a fix for that within the next few days, I'm probably going to revert one/both of the lcd speedup commits.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22627 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-09-05 03:50:04 +00:00
parent bcb3d52582
commit 46c719aac8
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
View file

@ -48,6 +48,13 @@ static int xoffset = 20; /* needed for flip */
* so block lcd_button_support the during updates */ * so block lcd_button_support the during updates */
static bool lcd_busy = false; static bool lcd_busy = false;
static inline void lcd_delay(int x)
{
do {
asm volatile ("nop\n");
} while (x--);
}
static void as3525_dbop_init(void) static void as3525_dbop_init(void)
{ {
CGU_DBOP = (1<<3) | AS3525_DBOP_DIV; CGU_DBOP = (1<<3) | AS3525_DBOP_DIV;
@ -70,29 +77,25 @@ static void as3525_dbop_init(void)
/* TODO: The OF calls some other functions here, but maybe not important */ /* TODO: The OF calls some other functions here, but maybe not important */
} }
#define lcd_write_single_data16(value) do {\ static void lcd_write_value16(unsigned short value)
DBOP_CTRL &= ~(1<<14|1<<13); \ {
DBOP_DOUT16 = (fb_data)(value); \ DBOP_CTRL &= ~(1<<14|1<<13);
} while(0) lcd_delay(10);
DBOP_DOUT16 = value;
while ((DBOP_STAT & (1<<10)) == 0);
}
static void lcd_write_cmd(int cmd) static void lcd_write_cmd(int cmd)
{ {
int x;
/* Write register */ /* Write register */
DBOP_TIMPOL_23 = 0xa167006e; DBOP_TIMPOL_23 = 0xa167006e;
lcd_write_single_data16(cmd); lcd_write_value16(cmd);
/* Wait for fifo to empty */ /* Wait for fifo to empty */
while ((DBOP_STAT & (1<<10)) == 0); while ((DBOP_STAT & (1<<10)) == 0);
/* This loop is unique to the Fuze */ /* This loop is unique to the Fuze */
x = 0; lcd_delay(4);
do {
asm volatile ("nop\n");
} while (x++ < 4);
DBOP_TIMPOL_23 = 0xa167e06f; DBOP_TIMPOL_23 = 0xa167e06f;
} }
@ -103,13 +106,14 @@ void lcd_write_data(const fb_data* p_bytes, int count)
if ((int)p_bytes & 0x3) if ((int)p_bytes & 0x3)
{ /* need to do a single 16bit write beforehand if the address is { /* need to do a single 16bit write beforehand if the address is
* not word aligned*/ * not word aligned*/
lcd_write_single_data16(*p_bytes); lcd_write_value16(*p_bytes);
count--;p_bytes++; count--;p_bytes++;
} }
/* from here, 32bit transfers are save */ /* from here, 32bit transfers are save */
/* set it to transfer 4*(outputwidth) units at a time, /* set it to transfer 4*(outputwidth) units at a time,
* if bit 12 is set it only does 2 halfwords though */ * if bit 12 is set it only does 2 halfwords though */
DBOP_CTRL |= (1<<13|1<<14); DBOP_CTRL |= (1<<13|1<<14);
lcd_delay(10);
data = (long*)p_bytes; data = (long*)p_bytes;
while (count > 1) while (count > 1)
{ {
@ -125,7 +129,7 @@ void lcd_write_data(const fb_data* p_bytes, int count)
/* due to the 32bit alignment requirement or uneven count, /* due to the 32bit alignment requirement or uneven count,
* we possibly need to do a 16bit transfer at the end also */ * we possibly need to do a 16bit transfer at the end also */
if (count > 0) if (count > 0)
lcd_write_single_data16(*(fb_data*)data); lcd_write_value16(*(unsigned short*)data);
} }
static void lcd_write_reg(int reg, int value) static void lcd_write_reg(int reg, int value)
@ -133,7 +137,7 @@ static void lcd_write_reg(int reg, int value)
unsigned short data = value; unsigned short data = value;
lcd_write_cmd(reg); lcd_write_cmd(reg);
lcd_write_single_data16(data); lcd_write_value16(data);
} }
/* turn the display upside down (call lcd_update() afterwards) */ /* turn the display upside down (call lcd_update() afterwards) */
@ -420,7 +424,7 @@ bool lcd_button_support(void)
lcd_window_y(-1, 0); lcd_window_y(-1, 0);
lcd_write_cmd(R_WRITE_DATA_2_GRAM); lcd_write_cmd(R_WRITE_DATA_2_GRAM);
lcd_write_single_data16(data); lcd_write_value16(data);
return true; return true;
} }