Merge branch 'lwip_dev' into devel

[palacios.git] / geekos / include / geekos / timer.h

diff --git a/geekos/include/geekos/timer.h b/geekos/include/geekos/timer.h
index f6add16..f5ae13f 100644 (file)
--- a/geekos/include/geekos/timer.h
+++ b/geekos/include/geekos/timer.h
@@ -14,7 +14,7 @@
 
 #define TIMER_IRQ 0
 
-extern volatile ulong_t g_numTicks;
+extern volatile unsigned long g_numTicks;
 
 typedef void (*timerCallback)(int, void*);
 
@@ -44,4 +44,6 @@ int Cancel_Timer(int id);
 
 void Micro_Delay(int us);
 
+unsigned long clock_time(void);  //return elipsed millisecs
+
 #endif  /* GEEKOS_TIMER_H */