Sun Jan 4 20:41:59 2009 UTC ()
fix status translation (two missing P in PPS* bits)


(kardel)
diff -r1.15 -r1.16 src/sys/sys/timex.h
cvs diff -r1.15 -r1.16 src/sys/sys/timex.h (expand / switch to unified diff)

--- src/sys/sys/timex.h 2008/12/23 20:52:07 1.15
+++ src/sys/sys/timex.h 2009/01/04 20:41:58 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: timex.h,v 1.15 2008/12/23 20:52:07 christos Exp $ */ 1/* $NetBSD: timex.h,v 1.16 2009/01/04 20:41:58 kardel Exp $ */
2 2
3/*- 3/*-
4 *********************************************************************** 4 ***********************************************************************
5 * * 5 * *
6 * Copyright (c) David L. Mills 1993-2001 * 6 * Copyright (c) David L. Mills 1993-2001 *
7 * * 7 * *
8 * Permission to use, copy, modify, and distribute this software and * 8 * Permission to use, copy, modify, and distribute this software and *
9 * its documentation for any purpose and without fee is hereby * 9 * its documentation for any purpose and without fee is hereby *
10 * granted, provided that the above copyright notice appears in all * 10 * granted, provided that the above copyright notice appears in all *
11 * copies and that both the copyright notice and this permission * 11 * copies and that both the copyright notice and this permission *
12 * notice appear in supporting documentation, and that the name * 12 * notice appear in supporting documentation, and that the name *
13 * University of Delaware not be used in advertising or publicity * 13 * University of Delaware not be used in advertising or publicity *
14 * pertaining to distribution of the software without specific, * 14 * pertaining to distribution of the software without specific, *
@@ -151,33 +151,33 @@ @@ -151,33 +151,33 @@
151#define STA_FREQHOLD 0x0080 /* hold frequency (rw) */ 151#define STA_FREQHOLD 0x0080 /* hold frequency (rw) */
152#define STA_PPSSIGNAL 0x0100 /* PPS signal present (ro) */ 152#define STA_PPSSIGNAL 0x0100 /* PPS signal present (ro) */
153#define STA_PPSJITTER 0x0200 /* PPS signal jitter exceeded (ro) */ 153#define STA_PPSJITTER 0x0200 /* PPS signal jitter exceeded (ro) */
154#define STA_PPSWANDER 0x0400 /* PPS signal wander exceeded (ro) */ 154#define STA_PPSWANDER 0x0400 /* PPS signal wander exceeded (ro) */
155#define STA_PPSERROR 0x0800 /* PPS signal calibration error (ro) */ 155#define STA_PPSERROR 0x0800 /* PPS signal calibration error (ro) */
156#define STA_CLOCKERR 0x1000 /* clock hardware fault (ro) */ 156#define STA_CLOCKERR 0x1000 /* clock hardware fault (ro) */
157#define STA_NANO 0x2000 /* resolution (0 = us, 1 = ns) (ro) */ 157#define STA_NANO 0x2000 /* resolution (0 = us, 1 = ns) (ro) */
158#define STA_MODE 0x4000 /* mode (0 = PLL, 1 = FLL) (ro) */ 158#define STA_MODE 0x4000 /* mode (0 = PLL, 1 = FLL) (ro) */
159#define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */ 159#define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */
160 160
161#define STA_FMT "\177\020\ 161#define STA_FMT "\177\020\
162b\0PLL\0\ 162b\0PLL\0\
163b\1PPSFREQ\0\ 163b\1PPSFREQ\0\
164b\2PSTIME\0\ 164b\2PPSTIME\0\
165b\3FLL\0\ 165b\3FLL\0\
166b\4INS\0\ 166b\4INS\0\
167b\5DEL\0\ 167b\5DEL\0\
168b\6UNSYNC\0\ 168b\6UNSYNC\0\
169b\7FREQHOLD\0\ 169b\7FREQHOLD\0\
170b\x8PSSIGNAL\0\ 170b\x8PPSSIGNAL\0\
171b\x9PPSJITTER\0\ 171b\x9PPSJITTER\0\
172b\xaPPSWANDER\0\ 172b\xaPPSWANDER\0\
173b\xbPPSERROR\0\ 173b\xbPPSERROR\0\
174b\xcCLOCKERR\0\ 174b\xcCLOCKERR\0\
175b\xdNANO\0\ 175b\xdNANO\0\
176f\xe\1MODE\0=\0PLL\0=\1FLL\0\ 176f\xe\1MODE\0=\0PLL\0=\1FLL\0\
177f\xf\1CLK\0=\0A\0=\1B\0" 177f\xf\1CLK\0=\0A\0=\1B\0"
178 178
179#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \ 179#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
180 STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK) 180 STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
181 181
182/* 182/*
183 * Clock states (time_state) 183 * Clock states (time_state)