diff options
| author | roberto <roberto@FreeBSD.org> | 2002-11-04 19:38:46 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2002-11-04 19:38:46 +0000 |
| commit | ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0 (patch) | |
| tree | f9bedaf87253bd22f25714971b90f734fca31a1d /contrib | |
| parent | 8f8f22cd2ab105b81ae68bd7cf1df69e51f79b6a (diff) | |
| download | FreeBSD-src-ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0.zip FreeBSD-src-ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0.tar.gz | |
Merge conflicts.
MFC after: 1 month
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ntp/html/driver42.html | 39 | ||||
| -rw-r--r-- | contrib/ntp/ntpd/ntp_control.c | 2 |
2 files changed, 2 insertions, 39 deletions
diff --git a/contrib/ntp/html/driver42.html b/contrib/ntp/html/driver42.html deleted file mode 100644 index 3622b84..0000000 --- a/contrib/ntp/html/driver42.html +++ /dev/null @@ -1,39 +0,0 @@ -<HTML> -<HEAD> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> - <META NAME="GENERATOR" CONTENT="Mozilla/4.01 [en] (Win95; I) [Netscape]"> - <TITLE>Zyfer GPStarplus Receiver</TITLE> -</HEAD> -<BODY> - -<H3>Zyfer GPStarplus Receiver</H3> - -<HR> -<H4>Synopsis</H4> -Address: 127.127.42.<I>u</I> -<BR>Reference ID: <TT>GPS</TT> -<BR>Driver ID: <TT>Zyfer GPStarplus</TT> -<BR>Serial Port: <TT>/dev/zyfer<I>u</I></TT>; 9600 baud, 8-bits, no parity -<BR>Features: <TT>(none)</TT> - -<H4>Description</H4> -This driver supports the <a href="http://www.zyfer.com/">Zyfer GPStarplus</a> -receiver. - -<p>The receiver has a DB15 port on the back which has input TxD and RxD -lines for configuration and control, and a separate TxD line for the -once-per-second timestamp. - -<p>Additionally, there are BNC connectors on the back for things like PPS -and IRIG output. - -</DL> -Additional Information - -<P><A HREF="refclock.htm">Reference Clock Drivers</A> -<HR> -<ADDRESS> -Harlan Stenn (stenn@whimsy.udel.edu)</ADDRESS> - -</BODY> -</HTML> diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index af667b5..1d428a2 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -403,6 +403,8 @@ static u_char clocktypes[] = { CTL_SST_TS_LF, /* REFCLK_JJY (40) */ CTL_SST_TS_UHF, /* REFCLK_TT560 (41) */ CTL_SST_TS_UHF, /* REFCLK_ZYFER (42) */ + CTL_SST_TS_UHF, /* REFCLK_RIPENCC (43) */ + CTL_SST_TS_UHF, /* REFCLK_NEOCLOCK4X (44) */ }; |
