devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Bootloaders are single core... (aka fix red)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15398 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-11-02 00:24:20 +00:00
parent ef8a7eaf2a
commit c888a9bebe
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/target/arm/ipod/video/lcd-video.c
View file

@ -65,7 +65,9 @@ struct {
long update_timeout; long update_timeout;
enum lcd_status state; enum lcd_status state;
bool blocked; bool blocked;
#if NUM_CORES > 1
struct corelock cl; /* inter-core sync */ struct corelock cl; /* inter-core sync */
#endif
} lcd_state IBSS_ATTR; } lcd_state IBSS_ATTR;
@ -108,7 +110,9 @@ static void bcm_setup_rect(unsigned x, unsigned y,
static void lcd_tick(void) static void lcd_tick(void)
{ {
/* No set_irq_level - already in interrupt context */ /* No set_irq_level - already in interrupt context */
#if NUM_CORES > 1
corelock_lock(&lcd_state.cl); corelock_lock(&lcd_state.cl);
#endif
if (!lcd_state.blocked && lcd_state.state >= LCD_NEED_UPDATE) if (!lcd_state.blocked && lcd_state.state >= LCD_NEED_UPDATE)
{ {
@ -131,17 +135,22 @@ static void lcd_tick(void)
lcd_state.state = LCD_IDLE; lcd_state.state = LCD_IDLE;
} }
} }
#if NUM_CORES > 1
corelock_unlock(&lcd_state.cl); corelock_unlock(&lcd_state.cl);
#endif
} }
static inline void lcd_block_tick(void) static inline void lcd_block_tick(void)
{ {
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL); int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
#if NUM_CORES > 1
corelock_lock(&lcd_state.cl); corelock_lock(&lcd_state.cl);
lcd_state.blocked = true; lcd_state.blocked = true;
corelock_unlock(&lcd_state.cl); corelock_unlock(&lcd_state.cl);
#else
lcd_state.blocked = true;
#endif
set_irq_level(oldlevel); set_irq_level(oldlevel);
} }
@ -151,8 +160,9 @@ static void lcd_unblock_and_update(void)
bool bcm_is_busy; bool bcm_is_busy;
int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL); int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
#if NUM_CORES > 1
corelock_lock(&lcd_state.cl); corelock_lock(&lcd_state.cl);
#endif
data = bcm_read32(0x1F8); data = bcm_read32(0x1F8);
bcm_is_busy = (data == 0xFFFA0005 || data == 0xFFFF); bcm_is_busy = (data == 0xFFFA0005 || data == 0xFFFF);
@ -169,8 +179,10 @@ static void lcd_unblock_and_update(void)
lcd_state.state = LCD_NEED_UPDATE; /* Post update request */ lcd_state.state = LCD_NEED_UPDATE; /* Post update request */
} }
lcd_state.blocked = false; lcd_state.blocked = false;
corelock_unlock(&lcd_state.cl);
#if NUM_CORES > 1
corelock_unlock(&lcd_state.cl);
#endif
set_irq_level(oldlevel); set_irq_level(oldlevel);
} }