--- Gnu-Mach/kern/timer.h	2020/09/02 04:42:45	1.1.1.2
+++ Gnu-Mach/kern/timer.h	2020/09/02 04:47:32	1.1.1.4
@@ -27,9 +27,6 @@
 #ifndef	_KERN_TIMER_H_
 #define _KERN_TIMER_H_
 
-#include <cpus.h>
-#include <stat_time.h>
-
 #include <kern/macro_help.h>
 
 #if	STAT_TIME
@@ -39,10 +36,37 @@
  *	as a result.  Service timers once an hour.
  */
 
+/*
+ *	TIMER_MAX is needed if a 32-bit rollover timer needs to be adjusted for
+ *	maximum value.
+ */
+#undef TIMER_MAX
+
+/*
+ *	TIMER_RATE is the rate of the timer in ticks per second.  It is used to
+ *	calculate percent cpu usage.
+ */
 #define TIMER_RATE	1000000
+
+/*
+ *	TIMER_HIGH_UNIT is the unit for high_bits in terms of low_bits.
+ *	Setting it to TIMER_RATE makes the high unit seconds.
+ */
 #define TIMER_HIGH_UNIT	TIMER_RATE
+
+/*
+ *	TIMER_ADJUST is used to adjust the value of a timer after it has been
+ *	copied into a time_value_t.  No adjustment is needed if high_bits is in
+ *	seconds.
+ */
 #undef	TIMER_ADJUST
 
+/*
+ *	MACHINE_TIMER_ROUTINES should defined if the timer routines are
+ *	implemented in machine-dependent code (e.g. assembly language).
+ */
+#undef	MACHINE_TIMER_ROUTINES
+
 #else	/* STAT_TIME */
 /*
  *	Machine dependent definitions based on hardware support.
@@ -100,13 +124,15 @@ typedef struct timer_save	timer_save_dat
 #define start_timer(timer)
 #define timer_switch(timer)
 #else	/* STAT_TIME */
-extern void	start_timer();
-extern void	timer_switch();
+extern void	start_timer(timer_t);
+extern void	timer_switch(timer_t);
 #endif	/* STAT_TIME */
 
-extern void		timer_read();
-extern void		thread_read_times();
-extern unsigned		timer_delta();
+extern void		timer_read(timer_t, time_value_t *);
+extern void		thread_read_times(thread_t, time_value_t *, time_value_t *);
+extern unsigned		timer_delta(timer_t, timer_save_t);
+extern void		timer_normalize(timer_t);
+extern void		timer_init(timer_t);
 
 #if	STAT_TIME
 /*
@@ -124,10 +150,10 @@ MACRO_END
 /*
  *	Exported hardware interface to timers
  */
-extern void	time_trap_uentry();
-extern void	time_trap_uexit();
-extern timer_t	time_int_entry();
-extern void	time_int_exit();
+extern void	time_trap_uentry(unsigned);
+extern void	time_trap_uexit(int);
+extern timer_t	time_int_entry(unsigned, timer_t);
+extern void	time_int_exit(unsigned, timer_t);
 #endif	/* STAT_TIME */
 
 /*
@@ -142,7 +168,7 @@ extern void	time_int_exit();
 
 #define TIMER_DELTA(timer, save, result)			\
 MACRO_BEGIN							\
-	register unsigned	temp;				\
+	unsigned	temp;					\
 								\
 	temp = (timer).low_bits;				\
 	if ((save).high != (timer).high_bits_check) {		\
@@ -154,4 +180,8 @@ MACRO_BEGIN							\
 	}							\
 MACRO_END
 
+extern void init_timers(void);
+
+void timer_init(timer_t this_timer);
+
 #endif	/* _KERN_TIMER_H_ */