summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-05-11 21:44:04 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-05-11 21:44:04 +0000
commite48a45a11ab05dae0cfc58edc0baddabd3170638 (patch)
tree1469c29ffbb208affcd8a36710b638afe8753a75
parentbb69a59a971b65441589f2ac5f3d258148af1d3f (diff)
downloadrockbox-e48a45a11ab05dae0cfc58edc0baddabd3170638.tar.gz
rockbox-e48a45a11ab05dae0cfc58edc0baddabd3170638.zip
The set_irq_level function was braindead
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@545 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/kernel.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/firmware/kernel.c b/firmware/kernel.c
index b0c28e56dc..8474126a0d 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -53,21 +53,13 @@ void yield(void)
/****************************************************************************
* Interrupt level setting
****************************************************************************/
-static int current_irq_level = 15;
-
int set_irq_level(int level)
{
- int old;
-
- /* First raise to highest level and update the shadow */
- asm volatile ("ldc %0, sr" : : "r" (15<<4));
- old = current_irq_level;
- current_irq_level = level;
-
- /* Then set the wanted level */
- asm volatile ("ldc %0, sr" : : "r" ((unsigned int)level<<4));
-
- return ((unsigned int)old >> 4) & 0x0f;
+ int i;
+ /* Read the old level and set the new one */
+ asm volatile ("stc sr, %0" : "=r" (i));
+ asm volatile ("ldc %0, sr" : : "r" (level << 4));
+ return (i >> 4) & 0x0f;
}
/****************************************************************************