aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/timex.h
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-10-01 02:28:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:27 -0400
commit0883d899ef862c1b0f8b2c2d38098470c193a3dd (patch)
tree414fcb7849c285bed87928b4d5be21304cd6724e /include/linux/timex.h
parentf19923937321244e7dc334767eb4b67e0e3d5c74 (diff)
[PATCH] ntp: cleanup defines and comments
Remove a few unused defines and remove obsolete information from comments. 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/linux/timex.h')
-rw-r--r--include/linux/timex.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index ac808f13fa0e..261381b5da82 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -74,24 +74,17 @@
74#define MAXTC 10 /* maximum time constant (shift) */ 74#define MAXTC 10 /* maximum time constant (shift) */
75 75
76/* 76/*
77 * The SHIFT_SCALE define establishes the decimal point of the time_phase 77 * The SHIFT_UPDATE define establishes the decimal point of the
78 * variable which serves as an extension to the low-order bits of the 78 * time_offset variable which represents the current offset with
79 * system clock variable. The SHIFT_UPDATE define establishes the decimal 79 * respect to standard time.
80 * point of the time_offset variable which represents the current offset
81 * with respect to standard time. The FINENSEC define represents 1 nsec in
82 * scaled units.
83 * 80 *
84 * SHIFT_USEC defines the scaling (shift) of the time_freq and 81 * SHIFT_USEC defines the scaling (shift) of the time_freq and
85 * time_tolerance variables, which represent the current frequency 82 * time_tolerance variables, which represent the current frequency
86 * offset and maximum frequency tolerance. 83 * offset and maximum frequency tolerance.
87 *
88 * FINENSEC is 1 ns in SHIFT_UPDATE units of the time_phase variable.
89 */ 84 */
90#define SHIFT_SCALE 22 /* phase scale (shift) */
91#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */ 85#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */
92#define SHIFT_USEC 16 /* frequency offset scale (shift) */ 86#define SHIFT_USEC 16 /* frequency offset scale (shift) */
93#define SHIFT_NSEC 12 /* kernel frequency offset scale */ 87#define SHIFT_NSEC 12 /* kernel frequency offset scale */
94#define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */
95 88
96#define MAXPHASE 512000L /* max phase error (us) */ 89#define MAXPHASE 512000L /* max phase error (us) */
97#define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */ 90#define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */