Deleted Added
full compact
kern_ntptime.c (2896) kern_ntptime.c (8876)
1/******************************************************************************
2 * *
3 * Copyright (c) David L. Mills 1993, 1994 *
4 * *
5 * Permission to use, copy, modify, and distribute this software and its *
6 * documentation for any purpose and without fee is hereby granted, provided *
7 * that the above copyright notice appears in all copies and that both the *
8 * copyright notice and this permission notice appear in supporting *

--- 39 unchanged lines hidden (view full) ---

48#include <sys/kernel.h>
49#include <sys/proc.h>
50#include <sys/timex.h>
51#include <vm/vm.h>
52#include <sys/sysctl.h>
53
54/*
55 * The following variables are used by the hardclock() routine in the
1/******************************************************************************
2 * *
3 * Copyright (c) David L. Mills 1993, 1994 *
4 * *
5 * Permission to use, copy, modify, and distribute this software and its *
6 * documentation for any purpose and without fee is hereby granted, provided *
7 * that the above copyright notice appears in all copies and that both the *
8 * copyright notice and this permission notice appear in supporting *

--- 39 unchanged lines hidden (view full) ---

48#include <sys/kernel.h>
49#include <sys/proc.h>
50#include <sys/timex.h>
51#include <vm/vm.h>
52#include <sys/sysctl.h>
53
54/*
55 * The following variables are used by the hardclock() routine in the
56 * kern_clock.c module and are described in that module.
56 * kern_clock.c module and are described in that module.
57 */
58extern int time_state; /* clock state */
59extern int time_status; /* clock status bits */
60extern long time_offset; /* time adjustment (us) */
61extern long time_freq; /* frequency offset (scaled ppm) */
62extern long time_maxerror; /* maximum error (us) */
63extern long time_esterror; /* estimated error (us) */
64extern long time_constant; /* pll time constant */

--- 50 unchanged lines hidden (view full) ---

115 }
116#else /* EXT_CLOCK */
117 microtime(&atv);
118#endif /* EXT_CLOCK */
119 ntv.time = atv;
120 ntv.maxerror = time_maxerror;
121 ntv.esterror = time_esterror;
122 splx(s);
57 */
58extern int time_state; /* clock state */
59extern int time_status; /* clock status bits */
60extern long time_offset; /* time adjustment (us) */
61extern long time_freq; /* frequency offset (scaled ppm) */
62extern long time_maxerror; /* maximum error (us) */
63extern long time_esterror; /* estimated error (us) */
64extern long time_constant; /* pll time constant */

--- 50 unchanged lines hidden (view full) ---

115 }
116#else /* EXT_CLOCK */
117 microtime(&atv);
118#endif /* EXT_CLOCK */
119 ntv.time = atv;
120 ntv.maxerror = time_maxerror;
121 ntv.esterror = time_esterror;
122 splx(s);
123
123
124 ntv.time_state = time_state;
125
126 /*
127 * Status word error decode. If any of these conditions
128 * occur, an error is returned, instead of the status
129 * word. Most applications will care only about the fact
130 * the system clock may not be trusted, not about the
131 * details.

--- 138 unchanged lines hidden ---
124 ntv.time_state = time_state;
125
126 /*
127 * Status word error decode. If any of these conditions
128 * occur, an error is returned, instead of the status
129 * word. Most applications will care only about the fact
130 * the system clock may not be trusted, not about the
131 * details.

--- 138 unchanged lines hidden ---