Do some simplification in switch_thread regarding interrupt enabling which simplifies kernel objects as well. Simply doing unconditional disable/enable should be fine in the firmware. Not sure about the case in the bootloader for all targets and so will evaluate but that should be fine too if everything is masked.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16107 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 10 deletions

diff --git a/uisimulator/sdl/thread-sdl.c b/uisimulator/sdl/thread-sdl.c
index b8297072f2..d1a8e60d01 100644
--- a/uisimulator/sdl/thread-sdl.c
+++ b/uisimulator/sdl/thread-sdl.c
@@ -135,8 +135,7 @@ bool thread_sdl_init(void *param)
     running->name = "main";
     running->state = STATE_RUNNING;
     running->context.c = SDL_CreateCond();
-    cores[CURRENT_CORE].irq_level = STAY_IRQ_LEVEL;
-
+ 
     if (running->context.c == NULL)
     {
         fprintf(stderr, "Failed to create main condition variable\n");
@@ -230,15 +229,9 @@ static void remove_from_list_l(struct thread_entry **list,
     thread->l.next->l.prev = thread->l.prev;
 }
 
-static void run_blocking_ops(void)
+static inline void run_blocking_ops(void)
 {
-    int level = cores[CURRENT_CORE].irq_level;
-
-    if (level != STAY_IRQ_LEVEL)
-    {
-        cores[CURRENT_CORE].irq_level = STAY_IRQ_LEVEL;
-        set_irq_level(level);
-    }
+    set_irq_level(0);
 }
 
 struct thread_entry *thread_get_current(void)