X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fgeekos%2Ftimer.h;h=6b123aa758ce2b1f91c23d0d7558d24ef0ff6a41;hb=3cfd36ea8e68ec218ae1aa3ac3c793037aa5c694;hp=bf09464f27c8e6c4b8116fc7cae1b7afdd7b9957;hpb=eb7dda8d4a92a2e8d0c8f867c65317d756ca6c11;p=palacios.releases.git

diff --git a/palacios/include/geekos/timer.h b/palacios/include/geekos/timer.h
index bf09464..6b123aa 100644
--- a/palacios/include/geekos/timer.h
+++ b/palacios/include/geekos/timer.h
@@ -1,6 +1,8 @@
 /*
  * GeekOS timer interrupt support
  * Copyright (c) 2001, David H. Hovemeyer <daveho@cs.umd.edu>
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+ * (c) 2008, The V3VEE Project <http://www.v3vee.org> 
  * $Revision: 1.2 $
  * 
  * This is free software.  You are permitted to use,
@@ -28,10 +30,14 @@ typedef struct {
     int origTicks;
 } timerEvent;
 
+int Start_Timer_Secs(int seconds, timerCallback cb);
+int Start_Timer_MSecs(int msecs, timerCallback cb);
 int Start_Timer(int ticks, timerCallback);
-int Get_Remaing_Timer_Ticks(int id);
-int Cancel_Timer(int id);
 
+double Get_Remaining_Timer_Secs(int id);
+int Get_Remaining_Timer_MSecs(int id);
+int Get_Remaining_Timer_Ticks(int id);
+int Cancel_Timer(int id);
 
 void Micro_Delay(int us);