Kernel/x86 - Clean up some of the task switching code (possibly a little broken)

[tpg/acess2.git] / KernelLand / Kernel / events.c

diff --git a/KernelLand/Kernel/events.c b/KernelLand/Kernel/events.c
index 84a1b0a..a572d43 100644 (file)
--- a/KernelLand/Kernel/events.c
+++ b/KernelLand/Kernel/events.c
@@ -7,8 +7,8 @@
  */
 #define DEBUG  0
 #include <acess.h>
-#include <threads_int.h>
 #include <events.h>
+#include <threads_int.h>
 
 // === CODE ===
 void Threads_PostEvent(tThread *Thread, Uint32 EventMask)
@@ -45,6 +45,8 @@ void Threads_PostEvent(tThread *Thread, Uint32 EventMask)
                        Semaphore_ForceWake(Thread);
                }
                break;
+       default:
+               break;
        }
        
        SHORTREL( &Thread->IsLocked );
@@ -80,19 +82,12 @@ Uint32 Threads_WaitEvents(Uint32 EventMask)
 
        // Check if a wait is needed
        SHORTLOCK( &us->IsLocked );
-       while( !(us->EventState & EventMask) )
+       LOG("Locked and preparing for wait");
+       if( (us->EventState & EventMask) == 0 )
        {
-               LOG("Locked and preparing for wait");
-               // Wait
-               us->RetStatus = EventMask;      // HACK: Store EventMask in RetStatus
-               SHORTLOCK( &glThreadListLock );
-               us = Threads_RemActive();
-               us->Status = THREAD_STAT_EVENTSLEEP;
-               // Note stored anywhere because we're woken using other means
-               SHORTREL( &glThreadListLock );
-               SHORTREL( &us->IsLocked );
-               Threads_int_WaitForStatusEnd(THREAD_STAT_EVENTSLEEP);
-               // Woken when lock is acquired
+               Threads_int_Sleep(THREAD_STAT_EVENTSLEEP, NULL, EventMask,
+                       &us, NULL, &us->IsLocked);
+               // Woken when an event fires
                SHORTLOCK( &us->IsLocked );
        }