diff options
| author | Roland McGrath <roland@gnu.org> | 2000-01-29 01:27:31 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-01-29 01:27:31 +0000 |
| commit | 157a341929576a1867e15ba7d270e1e3cbe3c4a8 (patch) | |
| tree | c58b872ed1a402c594ca0dd23c8876ef143bf1b0 /pfinet/timer-emul.c | |
| parent | 1e53886378dbb4ac7a83c1d1ce78833500ec6b62 (diff) | |
2000-01-27 Roland McGrath <roland@baalperazim.frob.com>
* mapped-time.h: Include <maptime.h>.
(fill_timeval): Function removed.
(fetch_jiffies): Use maptime_read.
* timer-emul.c (init_time): Use maptime_map and maptime_read.
* linux/sched.h (fetch_xtime): Use maptime_read.
* linux/time.h (do_gettimeofday): Likewise.
Diffstat (limited to 'pfinet/timer-emul.c')
| -rw-r--r-- | pfinet/timer-emul.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/pfinet/timer-emul.c b/pfinet/timer-emul.c index 6a7ab537..d0842787 100644 --- a/pfinet/timer-emul.c +++ b/pfinet/timer-emul.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995,96,2000 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -21,6 +21,7 @@ #include <linux/timer.h> #include <asm/system.h> #include <linux/sched.h> +#include <error.h> #include <string.h> #include "pfinet.h" @@ -144,24 +145,17 @@ init_timer (struct timer_list *timer) void init_time () { - device_t timedev; - memory_object_t timeobj; + error_t err; struct timeval tp; - device_open (master_device, 0, "time", &timedev); - device_map (timedev, VM_PROT_READ, 0, sizeof (mapped_time_value_t), - &timeobj, 0); - vm_map (mach_task_self (), (vm_address_t *)&mapped_time, - sizeof (mapped_time_value_t), 0, 1, timeobj, 0, 0, - VM_PROT_READ, VM_PROT_READ, VM_INHERIT_NONE); - mach_port_deallocate (mach_task_self (), timedev); - mach_port_deallocate (mach_task_self (), timeobj); + err = maptime_map (0, 0, &mapped_time); + if (err) + error (2, err, "cannot map time device"); - fill_timeval (&tp); + maptime_read (mapped_time, &tp); root_jiffies = (long long) tp.tv_sec * HZ + ((long long) tp.tv_usec * HZ) / 1000000; cthread_detach (cthread_fork ((cthread_fn_t) timer_function, 0)); } - |