diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-10-01 02:28:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:27 -0400 |
commit | 04b617e71e363e640e88be1e43f53fa6a3afef9f (patch) | |
tree | b59e8e75e4671bc5e10f4fcaace85d4658d4d0f0 /include | |
parent | 97eebe138caaf78354b1fad233e63bafdcc4fd54 (diff) |
[PATCH] ntp: convert time_freq to nsec value
This converts time_freq to a scaled nsec value and adds around 6bit of extra
resolution. This pushes the time_freq to its 32bit limits so the calculatons
have to be done with 64bit.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/timex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index 7715b4c0caf9..671609ee1a3d 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
@@ -91,10 +91,12 @@ | |||
91 | #define SHIFT_SCALE 22 /* phase scale (shift) */ | 91 | #define SHIFT_SCALE 22 /* phase scale (shift) */ |
92 | #define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */ | 92 | #define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */ |
93 | #define SHIFT_USEC 16 /* frequency offset scale (shift) */ | 93 | #define SHIFT_USEC 16 /* frequency offset scale (shift) */ |
94 | #define SHIFT_NSEC 12 /* kernel frequency offset scale */ | ||
94 | #define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */ | 95 | #define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */ |
95 | 96 | ||
96 | #define MAXPHASE 512000L /* max phase error (us) */ | 97 | #define MAXPHASE 512000L /* max phase error (us) */ |
97 | #define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */ | 98 | #define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */ |
99 | #define MAXFREQ_NSEC (512000L << SHIFT_NSEC) /* max frequency error (ppb) */ | ||
98 | #define MINSEC 16L /* min interval between updates (s) */ | 100 | #define MINSEC 16L /* min interval between updates (s) */ |
99 | #define MAXSEC 1200L /* max interval between updates (s) */ | 101 | #define MAXSEC 1200L /* max interval between updates (s) */ |
100 | #define NTP_PHASE_LIMIT (MAXPHASE << 5) /* beyond max. dispersion */ | 102 | #define NTP_PHASE_LIMIT (MAXPHASE << 5) /* beyond max. dispersion */ |