diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
| commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
| tree | df2373bb1119468873c667624769455c36dc3786 /kern/time_stamp.c | |
| parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
| parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/time_stamp.c')
| -rw-r--r-- | kern/time_stamp.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/kern/time_stamp.c b/kern/time_stamp.c index 22885b18..ee141a0e 100644 --- a/kern/time_stamp.c +++ b/kern/time_stamp.c @@ -32,31 +32,18 @@ /* * 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); @@ -66,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 */ } |