len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove struct spinlock to cleanup some mess and simplify. It's only used in boosting for multiprocesors and a pure two-corelock heirarchy will do just fine.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19910 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2009-02-03 12:16:45 +00:00
parent e2a169bce5
commit 3cf148945e
4 changed files with 18 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

43
firmware/system.c
View file

@ -33,10 +33,10 @@ long cpu_frequency SHAREDBSS_ATTR = CPU_FREQ;
static int boost_counter SHAREDBSS_ATTR = 0;
static bool cpu_idle SHAREDBSS_ATTR = false;
#if NUM_CORES > 1
struct spinlock boostctrl_spin SHAREDBSS_ATTR;
static struct corelock boostctrl_cl SHAREDBSS_ATTR;
void cpu_boost_init(void)
{
spinlock_init(&boostctrl_spin);
corelock_init(&boostctrl_cl);
}
#endif
@ -57,9 +57,7 @@ int cpu_boost_log_getcount(void)
char * cpu_boost_log_getlog_first(void)
{
char *first;
#if NUM_CORES > 1
spinlock_lock(&boostctrl_spin);
#endif
corelock_lock(&boostctrl_cl);
first = NULL;
@ -69,10 +67,7 @@ char * cpu_boost_log_getlog_first(void)
first = cpu_boost_calls[cpu_boost_first];
}
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
corelock_unlock(&boostctrl_cl);
return first;
}
@ -81,9 +76,7 @@ char * cpu_boost_log_getlog_next(void)
int message;
char *next;
#if NUM_CORES > 1
spinlock_lock(&boostctrl_spin);
#endif
corelock_lock(&boostctrl_cl);
message = (cpu_boost_track_message+cpu_boost_first)%MAX_BOOST_LOG;
next = NULL;
@ -94,18 +87,13 @@ char * cpu_boost_log_getlog_next(void)
next = cpu_boost_calls[message];
}
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
corelock_unlock(&boostctrl_cl);
return next;
}
void cpu_boost_(bool on_off, char* location, int line)
{
#if NUM_CORES > 1
spinlock_lock(&boostctrl_spin);
#endif
corelock_lock(&boostctrl_cl);
if (cpu_boost_calls_count == MAX_BOOST_LOG)
{
@ -124,10 +112,7 @@ void cpu_boost_(bool on_off, char* location, int line)
#else
void cpu_boost(bool on_off)
{
#if NUM_CORES > 1
spinlock_lock(&boostctrl_spin);
#endif
corelock_lock(&boostctrl_cl);
#endif /* CPU_BOOST_LOGGING */
if(on_off)
{
@ -153,16 +138,12 @@ void cpu_boost(bool on_off)
}
}
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
corelock_unlock(&boostctrl_cl);
}
void cpu_idle_mode(bool on_off)
{
#if NUM_CORES > 1
spinlock_lock(&boostctrl_spin);
#endif
corelock_lock(&boostctrl_cl);
cpu_idle = on_off;
@ -176,9 +157,7 @@ void cpu_idle_mode(bool on_off)
set_cpu_frequency(CPUFREQ_NORMAL);
}
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
corelock_unlock(&boostctrl_cl);
}
#endif /* HAVE_ADJUSTABLE_CPU_FREQ */