X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=blobdiff_plain;f=KernelLand%2FKernel%2Fevents.c;h=a572d43362d1e66628a7cd258a7bdfee581892fa;hp=84a1b0a5f3c9a859b70939806744f8e28d0605b7;hb=14d0ba44433f0f828aff710184fd3c597ab73999;hpb=083c31409b9f25c96807ab8fef8ac79e8fe4cf9e

diff --git a/KernelLand/Kernel/events.c b/KernelLand/Kernel/events.c
index 84a1b0a5..a572d433 100644
--- 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 );
 	}