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

Fixed compilation problems with boostctrl_mtx.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12927 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2007-03-26 17:29:04 +00:00
parent 66258a30a4
commit c284685525
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/system.c
View file

@ -36,7 +36,9 @@ long cpu_frequency NOCACHEBSS_ATTR = CPU_FREQ;
static int boost_counter NOCACHEBSS_ATTR = 0; static int boost_counter NOCACHEBSS_ATTR = 0;
static bool cpu_idle NOCACHEBSS_ATTR = false; static bool cpu_idle NOCACHEBSS_ATTR = false;
#if NUM_CORES > 1
struct mutex boostctrl_mtx NOCACHEBSS_ATTR; struct mutex boostctrl_mtx NOCACHEBSS_ATTR;
#endif
int get_cpu_boost_counter(void) int get_cpu_boost_counter(void)
{ {
@ -725,8 +727,10 @@ void set_cpu_frequency(long frequency)
{ {
unsigned long postmult; unsigned long postmult;
# if NUM_CORES > 1
/* Using mutex or spinlock isn't safe here. */ /* Using mutex or spinlock isn't safe here. */
while (test_and_set(&boostctrl_mtx.locked, 1)) ; while (test_and_set(&boostctrl_mtx.locked, 1)) ;
# endif
if (frequency == CPUFREQ_NORMAL) if (frequency == CPUFREQ_NORMAL)
postmult = CPUFREQ_NORMAL_MULT; postmult = CPUFREQ_NORMAL_MULT;
@ -767,7 +771,9 @@ void set_cpu_frequency(long frequency)
COP_INT_EN |= TIMER1_MASK; COP_INT_EN |= TIMER1_MASK;
# endif # endif
# if NUM_CORES > 1
boostctrl_mtx.locked = 0; boostctrl_mtx.locked = 0;
# endif
} }
#elif !defined(BOOTLOADER) #elif !defined(BOOTLOADER)
void ipod_set_cpu_frequency(void) void ipod_set_cpu_frequency(void)
@ -810,7 +816,10 @@ void system_init(void)
outl(-1, 0x60001028); outl(-1, 0x60001028);
outl(-1, 0x6000101c); outl(-1, 0x6000101c);
# if NUM_CORES > 1 && defined(HAVE_ADJUSTABLE_CPU_FREQ)
spinlock_init(&boostctrl_mtx); spinlock_init(&boostctrl_mtx);
# endif
#if (!defined HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES == 1) #if (!defined HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES == 1)
ipod_set_cpu_frequency(); ipod_set_cpu_frequency();
#endif #endif