X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Ftime.c;h=449afcd94b0ac810464a4399821b0d298ab5a5f1;hb=a88ba0c5436470438a63241b126f926968ef558f;hp=d4fd5ec5d8befe59fad041c62bca0af220458310;hpb=06de0dedbeeaec2be19b73a4500523efa3ab1852;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/time.c b/KernelLand/Kernel/time.c
index d4fd5ec5..449afcd9 100644
--- a/KernelLand/Kernel/time.c
+++ b/KernelLand/Kernel/time.c
@@ -1,5 +1,5 @@
 /*
- * Acess 2
+ * Acess2 Kernel
  * - By John Hodge (thePowersGang) 
  *
  * Timer Code
@@ -8,19 +8,11 @@
 #define DEBUG	0
 #include <acess.h>
 #include <timers.h>
+#include <timers_int.h>
 #include <events.h>
 #include <hal_proc.h>	// Proc_GetCurThread
 #include <workqueue.h>
-
-// === TYPEDEFS ===
-struct sTimer {
-	tTimer	*Next;
-	Sint64	FiresAfter;
-	void	(*Callback)(void*);
-	void	*Argument;
-//	tMutex	Lock;
-	BOOL	bActive;
-};
+#include <threads_int.h>	// Used to get thread timer
 
 // === PROTOTYPES ===
 void	Timer_CallbackThread(void *Unused);
@@ -240,11 +232,10 @@ void Time_FreeTimer(tTimer *Timer)
  */
 void Time_Delay(int Delay)
 {
-	tTimer	*t;
-	t = Time_AllocateTimer(NULL, NULL);
+	tTimer	*t = &Proc_GetCurThread()->ThreadTimer;
+	Time_InitTimer(t, NULL, NULL);
 	Time_ScheduleTimer(t, Delay);
 	Threads_WaitEvents(THREAD_EVENT_TIMER);
-	Time_FreeTimer(t);
 }
 
 // === EXPORTS ===