d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflicts.

Browse Source 
MFC after:	1 month
This commit is contained in:
roberto 2002-11-04 19:38:46 +00:00
parent 8f8f22cd2a
commit ad0bca971a
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contrib/ntp/html/driver42.html
View File

@ -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>&nbsp;
<HR>
<ADDRESS>
Harlan Stenn (stenn@whimsy.udel.edu)</ADDRESS>
</BODY>
</HTML>

2
contrib/ntp/ntpd/ntp_control.c
View File

@ -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) */
};