--- Gnu-Mach/kern/time_stamp.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/time_stamp.c	2020/09/02 04:47:36	1.1.1.4
@@ -1,61 +1,49 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
 #include <mach/std_types.h>
+#include <machine/locore.h>
 #include <sys/time.h>
 #include <kern/time_stamp.h>
 
 /*
  *	ts.c - kern_timestamp system call.
  */
-#ifdef	multimax
-#include <mmax/timer.h>
-#endif	multimax
-
-
-
 kern_return_t
-kern_timestamp(tsp)
-struct	tsval	*tsp;
+kern_timestamp(struct tsval *tsp)
 {
-#ifdef	multimax
-	struct	tsval	temp;
-	temp.low_val = FRcounter;
-	temp.high_val = 0;
-#else	multimax
 /*
 	temp.low_val = 0;
 	temp.high_val = ts_tick_count;
 */
 	time_value_t temp;
 	temp = time;
-#endif	multimax
 
-	if (copyout((char *)&temp,
-		    (char *)tsp,
+	if (copyout(&temp,
+		    tsp,
 		    sizeof(struct tsval)) != KERN_SUCCESS)
 	    return(KERN_INVALID_ADDRESS);
 	return(KERN_SUCCESS);
@@ -65,10 +53,7 @@ struct	tsval	*tsp;
  *	Initialization procedure.
  */
 
-void timestamp_init()
+void timestamp_init(void)
 {
-#ifdef	multimax
-#else	multimax
 	ts_tick_count = 0;
-#endif	multimax
 }