summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-10-28 16:49:02 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-10-28 16:49:02 +0000
commita8eeff0feefec4b1eec34980d45c87ac544d1778 (patch)
treeeeceb4d4459f943626bf465cd9b0c5ef75836f6a /uisimulator
parent7807279eaf698474e2eabde440b73a1f587ea7ef (diff)
downloadrockbox-a8eeff0feefec4b1eec34980d45c87ac544d1778.tar.gz
rockbox-a8eeff0feefec4b1eec34980d45c87ac544d1778.tar.bz2
rockbox-a8eeff0feefec4b1eec34980d45c87ac544d1778.zip
Improve the fake interrupt stuff on the sim a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15349 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/sdl/kernel.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/uisimulator/sdl/kernel.c b/uisimulator/sdl/kernel.c
index 220d069721..7126b82072 100644
--- a/uisimulator/sdl/kernel.c
+++ b/uisimulator/sdl/kernel.c
@@ -34,6 +34,7 @@ static SDL_cond *sim_thread_cond;
* inside a handler */
static SDL_mutex *sim_irq_mtx;
static int interrupt_level = HIGHEST_IRQ_LEVEL;
+static int handlers_pending = 0;
static int status_reg = 0;
extern struct core_entry cores[NUM_CORES];
@@ -53,7 +54,8 @@ int set_irq_level(int level)
if (status_reg == 0 && level == 0 && oldlevel != 0)
{
/* Not in a handler and "interrupts" are being reenabled */
- SDL_CondSignal(sim_thread_cond);
+ if (handlers_pending > 0)
+ SDL_CondSignal(sim_thread_cond);
}
interrupt_level = level; /* save new level */
@@ -65,16 +67,22 @@ int set_irq_level(int level)
void sim_enter_irq_handler(void)
{
SDL_LockMutex(sim_irq_mtx);
+ handlers_pending++;
+
if(interrupt_level != 0)
{
/* "Interrupts" are disabled. Wait for reenable */
SDL_CondWait(sim_thread_cond, sim_irq_mtx);
}
+
status_reg = 1;
}
void sim_exit_irq_handler(void)
{
+ if (--handlers_pending > 0)
+ SDL_CondSignal(sim_thread_cond);
+
status_reg = 0;
SDL_UnlockMutex(sim_irq_mtx);
}