Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce initial fade delay; remove bogus debug from lcd-meg-fx.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11985 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Greg White 2007-01-11 10:40:26 +00:00
parent 05e2d47c9f
commit a175b21fdb
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,8 +123,8 @@ void __backlight_init(void)
buttonlight_selected = 0x04;
/* delay 5 seconds before any fading */
initial_tick_delay = 5000;
/* delay 2 seconds before any fading */
initial_tick_delay = 2000;
/* put the led control on the tick list */
tick_add_task(led_control_service);
}
@ -570,8 +570,6 @@ static void led_control_service(void)
sc606_write(SC606_REG_CONF, buttonlight_leds);
backlight_control = BACKLIGHT_CONTROL_IDLE;
/* turn the lcd completely off after the fade or off command */
lcd_enable(false);
break;

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

@ -24,11 +24,6 @@ volatile bool lcd_poweroff = false;
extern unsigned fg_pattern;
extern unsigned bg_pattern;
static struct mutex lcd_update_mtx;
static struct mutex lcd_clear_mtx;
static struct mutex lcd_enable_mtx;
bool lcd_enabled()
{
return lcd_on;
@ -37,10 +32,6 @@ bool lcd_enabled()
/* LCD init */
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(bg_pattern_blit, bg_pattern, sizeof(bg_pattern_blit)/2);
clean_dcache_range((void *)fg_pattern_blit, sizeof(fg_pattern_blit));
@ -73,8 +64,6 @@ void lcd_update_rect(int x, int y, int width, int height)
}
if (use_dma_blit)
{
// mutex_lock(&lcd_update_mtx);
/* Wait for this controller to stop pending transfer */
while((DSTAT1 & 0x000fffff))
CLKCON |= (1 << 2); /* set IDLE bit */
@ -104,7 +93,6 @@ void lcd_update_rect(int x, int y, int width, int height)
/* Wait for transfer to complete */
while((DSTAT1 & 0x000fffff))
CLKCON |= (1 << 2); /* set IDLE bit */
// mutex_unlock(&lcd_update_mtx);
}
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)));
@ -115,7 +103,6 @@ void lcd_enable(bool state)
{
if(!lcd_poweroff)
return;
mutex_lock(&lcd_enable_mtx);
if(state) {
if(!lcd_on) {
lcd_on = true;
@ -129,7 +116,6 @@ void lcd_enable(bool state)
LCDCON1 &= ~1;
}
}
mutex_unlock(&lcd_enable_mtx);
}
void lcd_set_foreground(unsigned color)
@ -174,7 +160,6 @@ void lcd_clear_display_dma(void)
inc = true;
}
}
// mutex_lock(&lcd_clear_mtx);
/* Wait for any pending transfer to complete */
while((DSTAT3 & 0x000fffff))
CLKCON |= (1 << 2); /* set IDLE bit */
@ -198,7 +183,6 @@ void lcd_clear_display_dma(void)
/* Wait for transfer to complete */
while((DSTAT3 & 0x000fffff))
CLKCON |= (1 << 2); /* set IDLE bit */
// mutex_unlock(&lcd_update_mtx);
}
void lcd_clear_display(void)