len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-21 02:52:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add initial backlight delay to stop backlight from fading during boot; switch to IDLE instead of yield()

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11983 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Greg White 2007-01-11 10:24:21 +00:00
parent 991b2eefe9
commit ffb50d07af
2 changed files with 121 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c
View file

@ -36,9 +36,9 @@ static unsigned short backlight_current;
static unsigned short backlight_target; static unsigned short backlight_target;
static unsigned short time_til_fade; static unsigned short time_til_fade;
static unsigned short fade_interval; static unsigned short fade_interval;
static unsigned short initial_tick_delay;
static unsigned char backlight_leds; static unsigned char backlight_leds;
static enum backlight_states static enum backlight_states
{ {
BACKLIGHT_CONTROL_IDLE, BACKLIGHT_CONTROL_IDLE,
@ -123,6 +123,8 @@ void __backlight_init(void)
buttonlight_selected = 0x04; buttonlight_selected = 0x04;
/* delay 5 seconds before any fading */
initial_tick_delay = 5000;
/* put the led control on the tick list */ /* put the led control on the tick list */
tick_add_task(led_control_service); tick_add_task(led_control_service);
} }
@ -268,6 +270,10 @@ void __buttonlight_mode(enum buttonlight_mode mode,
*/ */
static void led_control_service(void) static void led_control_service(void)
{ {
if(initial_tick_delay) {
initial_tick_delay--;
return;
}
switch (backlight_control) switch (backlight_control)
{ {
case BACKLIGHT_CONTROL_IDLE: case BACKLIGHT_CONTROL_IDLE:
@ -638,6 +644,10 @@ static void led_control_service(void)
break; break;
} }
if(backlight_current)
lcd_enable(true);
else
lcd_enable(false);
} }

69
firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c
View file

@ -16,29 +16,45 @@ unsigned long fg_pattern_blit[4];
unsigned long bg_pattern_blit[4]; unsigned long bg_pattern_blit[4];
volatile bool use_dma_blit = false; volatile bool use_dma_blit = false;
volatile bool lcd_on = true; static volatile bool lcd_on = true;
volatile bool lcd_poweroff = true; volatile bool lcd_poweroff = false;
/* /*
** These are imported from lcd-16bit.c ** These are imported from lcd-16bit.c
*/ */
extern unsigned fg_pattern; extern unsigned fg_pattern;
extern unsigned bg_pattern; extern unsigned bg_pattern;
extern volatile bool lcd_on; static struct mutex lcd_update_mtx;
static struct mutex lcd_clear_mtx;
static struct mutex lcd_enable_mtx;
bool lcd_enabled()
{
return lcd_on;
}
/* LCD init */ /* LCD init */
void lcd_init_device(void) void lcd_init_device(void)
{ {
mutex_init(&lcd_update_mtx);
mutex_init(&lcd_clear_mtx);
mutex_init(&lcd_enable_mtx);
memset16(fg_pattern_blit, fg_pattern, sizeof(fg_pattern_blit)/2); memset16(fg_pattern_blit, fg_pattern, sizeof(fg_pattern_blit)/2);
memset16(bg_pattern_blit, bg_pattern, sizeof(bg_pattern_blit)/2); memset16(bg_pattern_blit, bg_pattern, sizeof(bg_pattern_blit)/2);
clean_dcache_range((void *)fg_pattern_blit, sizeof(fg_pattern_blit)); clean_dcache_range((void *)fg_pattern_blit, sizeof(fg_pattern_blit));
clean_dcache_range((void *)bg_pattern_blit, sizeof(bg_pattern_blit)); clean_dcache_range((void *)bg_pattern_blit, sizeof(bg_pattern_blit));
/* Switch from 555I mode to 565 mode */ LCDSADDR1 = 0x18F00000; /* These values are pulled from an F40 */
LCDCON5 |= 1 << 11; LCDSADDR2 = 0x00112C00; /* They should move FRAME to the correct location */
LCDSADDR3 = 0x000000F0; /* TODO: Move FRAME to where we want it */
LCDCON5 |= 1 << 11; /* Switch from 555I mode to 565 mode */
#if !defined(BOOTLOADER) #if !defined(BOOTLOADER)
use_dma_blit = true; use_dma_blit = true;
lcd_poweroff = true;
#endif #endif
} }
@ -52,15 +68,16 @@ void lcd_update_rect(int x, int y, int width, int height)
if(!lcd_on) if(!lcd_on)
{ {
for(x=0; x < 2; x++) sleep(200);
yield();
return; return;
} }
if (use_dma_blit) if (use_dma_blit)
{ {
// mutex_lock(&lcd_update_mtx);
/* Wait for this controller to stop pending transfer */ /* Wait for this controller to stop pending transfer */
while((DSTAT1 & 0x000fffff)) while((DSTAT1 & 0x000fffff))
yield(); CLKCON |= (1 << 2); /* set IDLE bit */
/* Flush DCache */ /* Flush DCache */
invalidate_dcache_range((void *)(((int) &lcd_framebuffer)+(y * sizeof(fb_data) * LCD_WIDTH)), (height * sizeof(fb_data) * LCD_WIDTH)); invalidate_dcache_range((void *)(((int) &lcd_framebuffer)+(y * sizeof(fb_data) * LCD_WIDTH)), (height * sizeof(fb_data) * LCD_WIDTH));
@ -86,7 +103,8 @@ void lcd_update_rect(int x, int y, int width, int height)
/* Wait for transfer to complete */ /* Wait for transfer to complete */
while((DSTAT1 & 0x000fffff)) while((DSTAT1 & 0x000fffff))
yield(); CLKCON |= (1 << 2); /* set IDLE bit */
// mutex_unlock(&lcd_update_mtx);
} }
else else
memcpy(((char*)FRAME) + (y * sizeof(fb_data) * LCD_WIDTH), ((char *)&lcd_framebuffer) + (y * sizeof(fb_data) * LCD_WIDTH), ((height * sizeof(fb_data) * LCD_WIDTH))); memcpy(((char*)FRAME) + (y * sizeof(fb_data) * LCD_WIDTH), ((char *)&lcd_framebuffer) + (y * sizeof(fb_data) * LCD_WIDTH), ((height * sizeof(fb_data) * LCD_WIDTH)));
@ -95,19 +113,23 @@ void lcd_update_rect(int x, int y, int width, int height)
void lcd_enable(bool state) void lcd_enable(bool state)
{ {
if(!lcd_poweroff)
return;
mutex_lock(&lcd_enable_mtx);
if(state) { if(state) {
if(lcd_poweroff && !lcd_on) { if(!lcd_on) {
memcpy(FRAME, lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT*2);
lcd_on = true; lcd_on = true;
memcpy(FRAME, lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT*2);
LCDCON1 |= 1; LCDCON1 |= 1;
} }
} }
else { else {
if(lcd_poweroff && lcd_on) { if(lcd_on) {
lcd_on = false; lcd_on = false;
LCDCON1 &= ~1; LCDCON1 &= ~1;
} }
} }
mutex_unlock(&lcd_enable_mtx);
} }
void lcd_set_foreground(unsigned color) void lcd_set_foreground(unsigned color)
@ -115,19 +137,19 @@ void lcd_set_foreground(unsigned color)
fg_pattern = color; fg_pattern = color;
memset16(fg_pattern_blit, fg_pattern, sizeof(fg_pattern_blit)/2); memset16(fg_pattern_blit, fg_pattern, sizeof(fg_pattern_blit)/2);
clean_dcache_range((void *)fg_pattern_blit, sizeof(fg_pattern_blit)); invalidate_dcache_range((void *)fg_pattern_blit, sizeof(fg_pattern_blit));
} }
void lcd_set_background(unsigned color) void lcd_set_background(unsigned color)
{ {
bg_pattern = color; bg_pattern = color;
memset16(bg_pattern_blit, bg_pattern, sizeof(bg_pattern_blit)/2); memset16(bg_pattern_blit, bg_pattern, sizeof(bg_pattern_blit)/2);
clean_dcache_range((void *)bg_pattern_blit, sizeof(bg_pattern_blit)); invalidate_dcache_range((void *)bg_pattern_blit, sizeof(bg_pattern_blit));
} }
void lcd_device_prepare_backdrop(fb_data* backdrop) void lcd_device_prepare_backdrop(fb_data* backdrop)
{ {
clean_dcache_range((void *)backdrop, (LCD_HEIGHT * sizeof(fb_data) * LCD_WIDTH)); invalidate_dcache_range((void *)backdrop, (LCD_HEIGHT * sizeof(fb_data) * LCD_WIDTH));
} }
void lcd_clear_display_dma(void) void lcd_clear_display_dma(void)
@ -136,10 +158,8 @@ void lcd_clear_display_dma(void)
bool inc = false; bool inc = false;
if(!lcd_on) { if(!lcd_on) {
yield(); sleep(200);
yield();
} }
if (lcd_get_drawmode() & DRMODE_INVERSEVID) if (lcd_get_drawmode() & DRMODE_INVERSEVID)
src = fg_pattern_blit; src = fg_pattern_blit;
else else
@ -154,9 +174,10 @@ void lcd_clear_display_dma(void)
inc = true; inc = true;
} }
} }
// mutex_lock(&lcd_clear_mtx);
/* Wait for any pending transfer to complete */ /* Wait for any pending transfer to complete */
while((DSTAT3 & 0x000fffff)) while((DSTAT3 & 0x000fffff))
yield(); CLKCON |= (1 << 2); /* set IDLE bit */
DMASKTRIG3 |= 0x4; /* Stop controller */ DMASKTRIG3 |= 0x4; /* Stop controller */
DIDST3 = ((int) lcd_framebuffer) + 0x30000000; /* set DMA dest, physical address */ DIDST3 = ((int) lcd_framebuffer) + 0x30000000; /* set DMA dest, physical address */
DIDSTC3 = 0; /* Dest on AHB, increment */ DIDSTC3 = 0; /* Dest on AHB, increment */
@ -165,10 +186,10 @@ void lcd_clear_display_dma(void)
DISRCC3 = inc ? 0x00 : 0x01; /* memory is on AHB bus, increment addresses based on backdrop */ DISRCC3 = inc ? 0x00 : 0x01; /* memory is on AHB bus, increment addresses based on backdrop */
/* Handshake on AHB, Burst mode, whole service mode, no reload, move 32-bits */ /* Handshake on AHB, Burst mode, whole service mode, no reload, move 32-bits */
DCON3 = ((1<<30) | (1<<28) | (1<<27) | (1<<22) | (2<<20)) | ((LCD_HEIGHT * sizeof(fb_data) * LCD_WIDTH) >> 4); DCON3 = ((1<<30) | (1<<28) | (1<<27) | (1<<22) | (2<<20)) | (sizeof(lcd_framebuffer) >> 4);
/* Dump DCache for dest, we are about to overwrite it with DMA */ /* Dump DCache for dest, we are about to overwrite it with DMA */
dump_dcache_range((void *)lcd_framebuffer, (LCD_HEIGHT * sizeof(fb_data) * LCD_WIDTH)); invalidate_dcache_range((void *)lcd_framebuffer, sizeof(lcd_framebuffer));
/* Activate the channel */ /* Activate the channel */
DMASKTRIG3 = 2; DMASKTRIG3 = 2;
/* Start DMA */ /* Start DMA */
@ -176,11 +197,14 @@ void lcd_clear_display_dma(void)
/* Wait for transfer to complete */ /* Wait for transfer to complete */
while((DSTAT3 & 0x000fffff)) while((DSTAT3 & 0x000fffff))
yield(); CLKCON |= (1 << 2); /* set IDLE bit */
// mutex_unlock(&lcd_update_mtx);
} }
void lcd_clear_display(void) void lcd_clear_display(void)
{ {
lcd_stop_scroll();
if(use_dma_blit) if(use_dma_blit)
{ {
lcd_clear_display_dma(); lcd_clear_display_dma();
@ -201,7 +225,6 @@ void lcd_clear_display(void)
else else
memcpy(dst, lcd_backdrop, sizeof(lcd_framebuffer)); memcpy(dst, lcd_backdrop, sizeof(lcd_framebuffer));
} }
lcd_stop_scroll();
} }