Commit cc2722e9 authored by Eric S. Raymond's avatar Eric S. Raymond

Carry through the mode->subtype change in documentation and comments/

Restores some changes earlier reverted.
parent a6b0c392
......@@ -149,6 +149,8 @@ with the Hayes connection and hang-up commands and result codes.
Not used by this driver.
+flag4 {0 | 1}+::
Not used by this driver.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -117,6 +117,8 @@ over the last 16 seconds.
Not used by this driver.
+flag4 {0 | 1}+::
Enable verbose +clockstats+ recording if set.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -56,6 +56,8 @@ written as-is to the +clockstats+ file.
Not used by this driver.
+flag4 {0 | 1}+::
Enable verbose +clockstats+ recording if set.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -40,6 +40,11 @@ and cable to either the microphone or line-in port of a workstation or
PC. In this implementation, only one audio driver and codec can be
supported on a single machine.
The ICOM code is normally compiled in the driver if selected (USE_ICOM_RADIO
defined), but is used only if the link /dev/icom%d is defined and
valid and the mode keyword on the refclock configuration command
specifies a nonzero mode (ICOM ID select code).
In general and without calibration, the driver is accurate within 1 ms
relative to the broadcast time when tracking a station. However,
variations up to 0.3 ms can be expected due to diurnal variations in
......@@ -384,8 +389,10 @@ alarms are nonfatal; only the data in the burst are discarded.
before the driver is started.
+flag4 {0 | 1}+::
Enable verbose +clockstats+ recording if set.
+mode+::
+subtype+::
Not used by this driver.
+mode+::
Select ICOM mode and device speed.
== Configuration Example ==
......
This diff is collapsed.
......@@ -220,6 +220,8 @@ since the last poll.
_[Primary Unit]_ If set, write a clock stats line on every poll cycle.
+mode+::
Control IBT and strict operating modes.
+mode+::
Synonym for subtype, retained for backward compatibility.
[[fn1]]link:#fn1bl[^1^)]Data transmission and decoding is done only once by the
primary unit. The decoded data is then processed independently in both
......
......@@ -59,7 +59,7 @@ HP-UX 9.10
This driver will probably work with the 58503B and 59551A if they are
set up appropriately.
To use an HP Z3801A, specify +mode 1+ on the server config line to setup
To use an HP Z3801A, specify +subtype 1+ on the server config line to setup
the right line parameters.
The timekeeping portion of HP's business has been sold to
......@@ -85,8 +85,10 @@ http://www.symmetricom.com/[Symmetricom].
Not used by this driver.
+flag4 {0 | 1}+::
Not used by this driver.
+mode+::
+subtype+::
Setting mode 1 configures for the HP Z3801A.
+mode+::
Synonym for subtype, retained for backward compatibility.
== Configuration Example ==
......
......@@ -192,6 +192,8 @@ The error flags are defined as follows in hex:
speaker volume must be set before the driver is started.
+flag4 {0 | 1}+::
Enable verbose +clockstats+ recording if set.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -14,19 +14,19 @@ sold in Japan, and the time service through a telephone line.
[width="100%",cols="<50%,<50%",]
|=================================================
|link:#mode-1[Tristate Ltd. TS-JJY01, TS-JJY02] |link:#mode-6[SEIKO TIME SYSTEMS INC. TDC-300]
|link:#mode-2[C-DEX Co.,Ltd. JST2000] |link:#mode-100[Telephone JJY]
|link:#mode-3[Echo Keisokuki Co.,Ltd. LT-2000] |
|link:#mode-4[CITIZEN T.I.C. CO.,LTD. JJY-200] |
|link:#mode-5[Tristate Ltd. TS-GPSclock-01] |
|link:#subtype-1[Tristate Ltd. TS-JJY01, TS-JJY02] |link:#subtype-6[SEIKO TIME SYSTEMS INC. TDC-300]
|link:#subtype-2[C-DEX Co.,Ltd. JST2000] |link:#subtype-100[Telephone JJY]
|link:#subtype-3[Echo Keisokuki Co.,Ltd. LT-2000] |
|link:#subtype-4[CITIZEN T.I.C. CO.,LTD. JJY-200] |
|link:#subtype-5[Tristate Ltd. TS-GPSclock-01] |
|=================================================
* [[mode-1]]Tristate Ltd. TS-JJY01, TS-JJY02 link:http://www.tristate.ne.jp/[] (Japanese only)
* [[subtype-1]]Tristate Ltd. TS-JJY01, TS-JJY02 link:http://www.tristate.ne.jp/[] (Japanese only)
+
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 1 time1 0.NNN flag1 {0|1};;
refclock jjy unit X subtype 1 time1 0.NNN flag1 {0|1};;
Time1 may specify a constant to be added to the time offset for the
time from the receiver, a fixed-point decimal number in seconds. You
may specify the time offset from several tens of milliseconds (
......@@ -59,12 +59,12 @@ The date and time are requested separately. The time is requested
before and after the date request to check uncertainty of the date
whether it's before or after midnight.
* [[mode-2]]C-DEX Co.,Ltd. JST2000 link:http://www.c-dex.co.jp/[] (Japanese only)
* [[subtype-2]]C-DEX Co.,Ltd. JST2000 link:http://www.c-dex.co.jp/[] (Japanese only)
+
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 2 time1 0.NNN;;
refclock jjy unit X subtype 2 time1 0.NNN;;
--
+
Interface::
......@@ -75,12 +75,12 @@ Time code format::
Command -\-> Reply +
+{ENQ}1J{ETX}+ -\-> +{STX}JYYMMDDWHHMMSSS{ETX}+
* [[mode-3]]Echo Keisokuki Co.,Ltd. LT-2000 link:http://www.clock.co.jp/[] (domain no longer registered)
* [[subtype-3]]Echo Keisokuki Co.,Ltd. LT-2000 link:http://www.clock.co.jp/[] (domain no longer registered)
+
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 3 time1 0.NNN;;
refclock jjy unit X subtype 3 time1 0.NNN;;
--
+
Interface::
......@@ -91,17 +91,17 @@ Time code format::
[width="100%",cols="<45%,<10%,<45%",grid="none",frame="none"]
|===================================================================
|Command | -\-> | Reply
|C | -\-> | ( Mode 2 : Continuous )
|C | -\-> | ( Subtype 2 : Continuous )
|( Every second before 0.5 second )| | +YYMMDDWHHMMSS{ST1}{ST2}{ST3}{ST4}{CR}+
|# | -\-> | ( Mode 1 : Request&Send )
|# | -\-> | ( Subtype 1 : Request&Send )
|===================================================================
* [[mode-4]]CITIZEN T.I.C. CO.,LTD. JJY-200 link:http://www.tic-citizen.co.jp/[] (Japanese only)
* [[subtype-4]]CITIZEN T.I.C. CO.,LTD. JJY-200 link:http://www.tic-citizen.co.jp/[] (Japanese only)
+
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 4 time1 0.NNN;;
refclock jjy unit X subtype 4 time1 0.NNN;;
--
+
Interface::
......@@ -115,11 +115,12 @@ Time code format::
|(Every second)| -\-> |+'XX YY/MM/DD W HH:MM:SS{CR}+
|======================================
* [[mode-5]]Tristate Ltd. TS-GPSclock-01 link:http://www.tristate.ne.jp/[] (Japanese only)
* [[subtype-5]]Tristate Ltd. TS-GPSclock-01 link:http://www.tristate.ne.jp/[] (Japanese only)
+
This driver supports the Tristate TS-GPSclock-01 in command/response
mode, though it is a GPS clock, not JJY radio clock. Using the menus and
the onboard switches, the TS-GPSclock-01 should be set to command/response mode and JUST time zone.
subtype, though it is a GPS clock, not JJY radio clock. Using the
menus and the onboard switches, the TS-GPSclock-01 should be set to
command/response mode and JUST time zone.
+
Besides this driver, link:driver_nmea.html[the generic NMEA
GPS driver] supports the TS-GPSclock-01 in NMEA mode.
......@@ -127,7 +128,7 @@ GPS driver] supports the TS-GPSclock-01 in NMEA mode.
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 5 time1 0.NNN flag1 {0|1};;
refclock jjy unit X subtype 5 time1 0.NNN flag1 {0|1};;
Time1 may specify a constant to be added to the time offset for the
time from the receiver, a fixed-point decimal number in seconds. +
Flag1 has no effect for time synchronization. When a flag1 is set to
......@@ -159,7 +160,7 @@ The date and time are requested separately. The time is requested
before and after the date request to check uncertainty of the date
whether it's before or after midnight.
* [[mode-6]]SEIKO TIME SYSTEMS INC. TDC-300 link:http://www.seiko-sts.co.jp/[] (English and Japanese)
* [[subtype-6]]SEIKO TIME SYSTEMS INC. TDC-300 link:http://www.seiko-sts.co.jp/[] (English and Japanese)
+
The TDC-300 must be set to the type 3 data format using the front panel
menu display and the switches.
......@@ -167,7 +168,7 @@ menu display and the switches.
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode 6 time1 0.NNN;;
refclock jjy unit X subtype 6 time1 0.NNN;;
--
+
Interface::
......@@ -182,30 +183,31 @@ Time code format::
|( 5 to 10 mSec. before second )| |+{STX}{xE5}{ETX}+
|============================================================================
* [[mode-100]]Telephone JJY link:http://jjy.nict.go.jp/[] (English and Japanese)
* [[subtype-100]]Telephone JJY link:http://jjy.nict.go.jp/[] (English and Japanese)
+
The telephone JJY is the time service through a public telephone line. +
The service is provided by the National Institute of Information and
Communications Technology in Japan.
+
ATTENTION; This mode, the telephone JJY, can not be used with the
ATTENTION; This subtype, the telephone JJY, can not be used with the
refclock_acts driver at the same time. Because the "phone"
statement in the configuration file is not involved with the
"server" statement, so the both the refclock_acts and this
refclock_jjy ( mode 100 to 180 ) can not recognize the
refclock_jjy ( subtype 100 to 180 ) can not recognize the
appropriate "phone" statement among the "phone" statements.
+
NTP configuration ( {ntpconf} )::
+
--
refclock jjy unit X mode (100, 101 to 180) minpoll N;;
The mode 100 is specified, this driver does not issue the loopback
refclock jjy unit X subtype (100, 101 to 180) minpoll N;;
The subtype 100 is specified, this driver does not issue the loopback
command in order to measure the delay, and the delay of the
delay of the telephone line and the system processing is not
adjusted.
+
The mode 101 to 180 is specified, this driver issues the loopback
command and measures the delay of the telephone line and the system processing through the Telephone JJY loopback circuit.
The subtype 101 to 180 is specified, this driver issues the loopback
command and measures the delay of the telephone line and the system
processing through the Telephone JJY loopback circuit.
+
The round trip time through the Telphone JJY loopback circuit is
measured 5 times, and each delay time is greater than 700
......@@ -217,14 +219,14 @@ than 4 times, the minimum delay time among them is ignored, like
marking/grading sports judgment.
+
The adjustment time is calculated by the formula, multiply ( the
measured round trip time ) by ( ( the mode number ) - 100 ) %,
measured round trip time ) by ( ( the subtype number ) - 100 ) %,
and the adjustment delay time is added to the synchronizing time.
+
If you choose the automatic delay adjustment, in other words, the mode
101 to 180 is specified, the recommended mode number is 145 to 165.
If you choose the automatic delay adjustment, in other words, the subtype
101 to 180 is specified, the recommended subtype number is 145 to 165.
+
The default polling interval 6 ( 64 seconds ) is too short for this
mode. The "minpoll" should be set to greater than or equal to 8 ( 256
subtype. The "minpoll" should be set to greater than or equal to 8 ( 256
seconds, about 4 minutes ).
+
The interval time is given the value in second power of 2. The
......@@ -233,11 +235,13 @@ minpoll value 12 is 4096 seconds interval ( about 1 hour ), 14 is
about 18 hours ), respectively.
flag1 {0|1} flag2 {0|1} flag3 {0|1} flag4 {0|1};;
Time1 may specify a constant to be added to the time offset for the time from the receiver, a fixed-point decimal number in seconds. +
When the mode 100 is specified, the time1 may be specified in order to adjust the time offset. +
When the mode 101 to 180 is specified, the time1 should not be
specified because this driver adds some percentage of the measured
loopback delay, depending on the value of the mode number.
Time1 may specify a constant to be added to the time offset for
the time from the receiver, a fixed-point decimal number in
seconds. When the subtype 100 is specified, the time1 may be
specified in order to adjust the time offset. When the subtype 101
to 180 is specified, the time1 should not be specified because
this driver adds some percentage of the measured loopback delay,
depending on the value of the subtype number.
+
.Flag1 is the modem dialing type
[width="100%",cols="<34%,<33%,<33%",]
......@@ -380,8 +384,10 @@ filegen clockstats file clockstats type day enable
See corresponding receiver.
+flag4 {0 | 1}+::
See corresponding receiver.
+subtype+::
Used to select a device type and serial parameters.
+mode+::
Used to select a device type and serial paramters.
Synonym for subtype, retained for backward compatibility.
== Configuration Examples ==
......
......@@ -66,6 +66,8 @@ running correctly.
clear.
+flag4 {0 | 1}+::
Not used by this driver.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -56,6 +56,8 @@ No +filegen clockstats+ monitor data are produced by this driver.
Not used by this driver.
+flag4 {0 | 1}+::
Not used by this driver.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -71,6 +71,8 @@ Format].
Not used by this driver.
+flag4 {0 | 1}+::
Not used by this driver.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -63,6 +63,9 @@ link:clockopt.html[+flag4 {0 | 1}+]::
+
Default setting is 0 = don't log received data and converted utc time.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -235,6 +235,8 @@ switched on by sending the following string.
if 0 (default); use the kernel discipline if 1.
+flag4 {0 | 1}+::
Obscures location in timecode: 0 for disable (default), 1 for enable.
+subtype+::
Not used by this driver.
+mode+::
Used to control baud rate, GPS sentence selection, and logging.
......
......@@ -76,6 +76,8 @@ specific receiver in use will be required.
Not used by this driver.
+flag4 {0 | 1}+::
Not used by this driver.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -235,12 +235,15 @@ link:#refid[+refid string+]::
+flag4 {0 | 1}+::
Not used by this driver.
+mode+ 'number'::
+subtype+ 'number'::
The mode parameter to the server command specifies the specific hardware
this driver is for. The default is 0 for a normal Trimble Palisade. The
other options are *1* for an *Endrun Praecis* in Trimble emulation mode,
and *2* for the *Trimble Thunderbolt* GPS Disciplined Clock Receiver.
+mode+ 'number'::
Synonym for subtype, retained for backward compatibility.
== Configuration Example ==
----------------------------------------------------------------------------
......
......@@ -115,6 +115,8 @@ synchronization without needing the Internet at all.
+flag4 {0 | 1}+::
Record a timestamp once for each second if 1. Useful for constructing
Allan deviation plots.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -173,6 +173,8 @@ for the specific unit.
+flag4 {0 | 1}+::
If flag4 is set, clockstats records will be written when the driver is
polled.
+subtype+::
Not used by this driver.
+mode+::
Can be used to set private mode
......
......@@ -109,6 +109,8 @@ received.
Enable verbose +clockstats+ recording if set.
+mode+::
Not used by this driver.
+mode+::
Not used by this driver.
== Configuration Example ==
......
......@@ -117,6 +117,8 @@ written as-is to the +clockstats+ file.
Not used by this driver.
+flag4 {0 | 1}+::
Enable verbose +clockstats+ recording if set.
+subtype+::
Not used by this driver.
+mode+::
Not used by this driver.
......
......@@ -182,12 +182,12 @@
* The audio codec code is normally compiled in the driver if the
* architecture supports it (ENABLE_CHU_AUDIO defined), but is used only if
* the link /dev/chu_audio is defined and valid. The serial port code is
* always compiled in the driver, but is used only if the autdio codec
* always compiled in the driver, but is used only if the audio codec
* is not available and the link /dev/chu%d is defined and valid.
*
* The ICOM code is normally compiled in the driver if selected (USE_ICOM_RADIO
* defined), but is used only if the link /dev/icom%d is defined and
* valid and the mode keyword on the server configuration command
* valid and the mode keyword on the refclock configuration command
* specifies a nonzero mode (ICOM ID select code). The C-IV speed is
* 9600 bps if the high order 0x80 bit of the mode is zero and 1200 bps
* if one. The C-IV trace is turned on if the debug level is greater
......
......@@ -9,11 +9,11 @@
* Copyright 2015 by the NTPsec project contributors
* SPDX-License-Identifier: BSD-3-Clause
*
* Note: some modes are obsolete and could probably stand to be removed
* next time this code gets serious attention. In particular, modes 9 and 10
* Note: some subtypes are obsolete and could probably stand to be removed
* next time this code gets serious attention. In particular, subtypes 9 and 10
* support the Trimble SVeeSix, which was discontinued before 2003. Related
* code in the parse library could also be dropped.
* Also see modes 3 and 4, for which no information in use since 1999 and
* Also see subtypes 3 and 4, for which no information in use since 1999 and
* 2001 respectively can be found on the web.
*/
......@@ -857,7 +857,7 @@ static struct parse_clockinfo
u_long cl_keep; /* samples for median filter to keep */
} parse_clockinfo[] =
{
{ /* mode 0 */
{ /* subtype 0 */
MBG_FLAGS,
NO_POLL,
NO_INIT,
......@@ -881,7 +881,7 @@ static struct parse_clockinfo
DCFPZF535_SAMPLES,
DCFPZF535_KEEP
},
{ /* mode 1 */
{ /* subtype 1 */
MBG_FLAGS,
NO_POLL,
NO_INIT,
......@@ -905,7 +905,7 @@ static struct parse_clockinfo
DCFPZF535OCXO_SAMPLES,
DCFPZF535OCXO_KEEP
},
{ /* mode 2 */
{ /* subtype 2 */
MBG_FLAGS,
NO_POLL,
NO_INIT,
......@@ -929,7 +929,7 @@ static struct parse_clockinfo
DCFUA31_SAMPLES,
DCFUA31_KEEP
},
{ /* mode 3 */
{ /* subtype 3 */
MBG_FLAGS,
NO_POLL,
NO_INIT,
......@@ -953,7 +953,7 @@ static struct parse_clockinfo
DCF7000_SAMPLES,
DCF7000_KEEP
},
{ /* mode 4 */
{ /* subtype 4 */
NO_CL_FLAGS,
WSDCF_POLL,
WSDCF_INIT,
......@@ -977,7 +977,7 @@ static struct parse_clockinfo
WSDCF_SAMPLES,
WSDCF_KEEP
},
{ /* mode 5 */
{ /* subtype 5 */
RAWDCF_FLAGS,
NO_POLL,
RAWDCF_INIT,
......@@ -1001,7 +1001,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 6 */
{ /* subtype 6 */
RAWDCF_FLAGS,
NO_POLL,
RAWDCF_INIT,
......@@ -1025,7 +1025,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 7 */
{ /* subtype 7 */
MBG_FLAGS,
GPS16X_POLL,
GPS16X_INIT,
......@@ -1049,7 +1049,7 @@ static struct parse_clockinfo
GPS16X_SAMPLES,
GPS16X_KEEP
},
{ /* mode 8 */
{ /* subtype 8 */
RAWDCF_FLAGS,
NO_POLL,
NO_INIT,
......@@ -1073,7 +1073,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 9 */
{ /* subtype 9 */
TRIMBLETAIP_FLAGS,
#if TRIM_POLLRATE /* DHD940515: Allow user config */
NO_POLL,
......@@ -1101,7 +1101,7 @@ static struct parse_clockinfo
TRIMBLETAIP_SAMPLES,
TRIMBLETAIP_KEEP
},
{ /* mode 10 */
{ /* subtype 10 */
TRIMBLETSIP_FLAGS,
#if TRIM_POLLRATE /* DHD940515: Allow user config */
NO_POLL,
......@@ -1129,7 +1129,7 @@ static struct parse_clockinfo
TRIMBLETSIP_SAMPLES,
TRIMBLETSIP_KEEP
},
{ /* mode 11 */
{ /* subtype 11 */
NO_CL_FLAGS,
RCC8000_POLL,
RCC8000_INIT,
......@@ -1153,7 +1153,7 @@ static struct parse_clockinfo
RCC8000_SAMPLES,
RCC8000_KEEP
},
{ /* mode 12 */
{ /* subtype 12 */
HOPF6021_FLAGS,
NO_POLL,
NO_INIT,
......@@ -1177,7 +1177,7 @@ static struct parse_clockinfo
HOPF6021_SAMPLES,
HOPF6021_KEEP
},
{ /* mode 13 */
{ /* subtype 13 */
COMPUTIME_FLAGS,
NO_POLL,
NO_INIT,
......@@ -1201,7 +1201,7 @@ static struct parse_clockinfo
COMPUTIME_SAMPLES,
COMPUTIME_KEEP
},
{ /* mode 14 */
{ /* subtype 14 */
RAWDCF_FLAGS,
NO_POLL,
RAWDCFDTRSET_INIT,
......@@ -1225,7 +1225,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 15 */
{ /* subtype 15 */
0, /* operation flags (io modes) */
NO_POLL, /* active poll routine */
NO_INIT, /* active poll init routine */
......@@ -1251,7 +1251,7 @@ static struct parse_clockinfo
5, /* samples for median filter */
3, /* samples for median filter to keep */
},
{ /* mode 16 - RAWDCF RTS set, DTR clr */
{ /* subtype 16 - RAWDCF RTS set, DTR clr */
RAWDCF_FLAGS,
NO_POLL,
RAWDCFDTRCLRRTSSET_INIT,
......@@ -1275,7 +1275,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 17 */
{ /* subtype 17 */
VARITEXT_FLAGS,
NO_POLL,
NO_INIT,
......@@ -1299,7 +1299,7 @@ static struct parse_clockinfo
VARITEXT_SAMPLES,
VARITEXT_KEEP
},
{ /* mode 18 */
{ /* subtype 18 */
MBG_FLAGS,
NO_POLL,
NO_INIT,
......@@ -1323,7 +1323,7 @@ static struct parse_clockinfo
GPS16X_SAMPLES,
GPS16X_KEEP
},
{ /* mode 19 */
{ /* subtype 19 */
RAWDCF_FLAGS,
NO_POLL,
RAWDCF_INIT,
......@@ -1347,7 +1347,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 20, like mode 14 but driven by 75 baud */
{ /* subtype 20, like subtype 14 but driven by 75 baud */
RAWDCF_FLAGS,
NO_POLL,
RAWDCFDTRSET_INIT,
......@@ -1371,7 +1371,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 21, like mode 16 but driven by 75 baud
{ /* subtype 21, like subtype 16 but driven by 75 baud
- RAWDCF RTS set, DTR clr */
RAWDCF_FLAGS,
NO_POLL,
......@@ -1396,7 +1396,7 @@ static struct parse_clockinfo
RAWDCF_SAMPLES,
RAWDCF_KEEP
},
{ /* mode 22 - like 2 with POWERUP trust */
{ /* subtype 22 - like 2 with POWERUP trust */
MBG_FLAGS | PARSE_F_POWERUPTRUST,
NO_POLL,
NO_INIT,
......@@ -1420,7 +1420,7 @@ static struct parse_clockinfo
DCFUA31_SAMPLES,
DCFUA31_KEEP
},
{ /* mode 23 - like 7 with POWERUP trust */
{ /* subtype 23 - like 7 with POWERUP trust */
MBG_FLAGS | PARSE_F_POWERUPTRUST,
GPS16X_POLL,
GPS16X_INIT,
......@@ -1444,7 +1444,7 @@ static struct parse_clockinfo
GPS16X_SAMPLES,
GPS16X_KEEP
},
{ /* mode 24 */
{ /* subtype 24 */
SEL240X_FLAGS,
SEL240X_POLL,
SEL240X_INIT,
......
......@@ -41,7 +41,7 @@
* The same driver also handles the HP Z3801A which is available surplus
* from the cell phone industry. It's popular with hams.
* It needs a different line setup: 19200 baud, 7 data bits, odd parity
* That is selected by adding "mode 1" to the server line in ntp.conf
* That is selected by adding "subtype 1" to the server line in ntp.conf
* HP Z3801A code from Jeff Mock added by Hal Murray, Sep 2005
*
*
......@@ -163,7 +163,7 @@ hpgps_start(
snprintf(device, sizeof(device), DEVICE, unit);
ldisc = LDISC_CLK;
speed = SPEED232;
/* mode parameter to server config line shares ttl slot */
/* subtype parameter to server config line shares ttl slot */
if (1 == peer->ttl) {
ldisc |= LDISC_7O1;
speed = SPEED232Z;
......
......@@ -427,11 +427,11 @@ jjy_start ( int unit, struct peer *peer )
/* Set up the device name */
snprintf( sDeviceName, sizeof(sDeviceName), DEVICE, unit ) ;
snprintf( sLog, sizeof(sLog), "mode=%d dev=%s", peer->ttl, sDeviceName ) ;
snprintf( sLog, sizeof(sLog), "subtype=%d dev=%s", peer->ttl, sDeviceName ) ;
jjy_write_clockstats( peer, JJY_CLOCKSTATS_MARK_JJY, sLog ) ;
/*
* peer->ttl is a mode number specified by "127.127.40.X mode N" in the ntp.conf
* peer->ttl is a subtype number specified by "jjy subtype N" in the ntp.conf
*/
switch ( peer->ttl ) {
case 0 :
......@@ -460,7 +460,7 @@ jjy_start ( int unit, struct peer *peer )
if ( 101 <= peer->ttl && peer->ttl <= 180 ) {
rc = jjy_start_telephone ( unit, peer, up ) ;
} else {
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
msyslog ( LOG_ERR, "JJY receiver [ %s subtype %d ] : Unsupported mode",
ntoa(&peer->srcadr), peer->ttl ) ;
free ( (void*) up ) ;
return false ;
......@@ -468,7 +468,7 @@ jjy_start ( int unit, struct peer *peer )
}
if ( rc != 0 ) {
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Initialize error",
msyslog ( LOG_ERR, "JJY receiver [ %s subtype %d ] : Initialize error",
ntoa(&peer->srcadr), peer->ttl ) ;
free ( (void*) up ) ;
return false ;
......@@ -533,7 +533,7 @@ jjy_shutdown ( int unit, struct peer *peer )
free ( up ) ;
}
snprintf( sLog, sizeof(sLog), "JJY stopped. unit=%d mode=%d", unit, peer->ttl ) ;
snprintf( sLog, sizeof(sLog), "JJY stopped. unit=%d subtype=%d", unit, peer->ttl ) ;
record_clock_stats( &peer->srcadr, sLog ) ;
}
......@@ -1037,7 +1037,7 @@ jjy_synctime ( struct peer *peer, struct refclockproc *pp, struct jjyunit *up )
/*## ##*/
/*## The Tristate Ltd. JJY receiver TS-JJY01, TS-JJY02 ##*/
/*## ##*/
/*## server 127.127.40.X mode 1 ##*/
/*## refclock jjy unit X subtype 1 ##*/
/*## ##*/
/*################################################################################################*/
/*################################################################################################*/
......@@ -1368,7 +1368,7 @@ jjy_poll_tristate_jjy01 ( int unit, struct peer *peer )
/*## ##*/
/*## The C-DEX Co. Ltd. JJY receiver JST2000 ##*/
/*## ##*/
/*## server 127.127.40.X mode 2 ##*/
/*## refclock jjy unit X subtype 2 ##*/
/*## ##*/
/*################################################################################################*/
/*################################################################################################*/
......@@ -1531,7 +1531,7 @@ jjy_poll_cdex_jst2000 ( int unit, struct peer *peer )
/*## ##*/
/*## The Echo Keisokuki Co. Ltd. JJY receiver LT2000 ##*/
/*## ##*/
/*## server 127.127.40.X mode 3 ##*/
/*## refclock jjy unit X subtype 3 ##*/
/*## ##*/
/*################################################################################################*/
/*################################################################################################*/
......@@ -1763,7 +1763,7 @@ jjy_poll_echokeisokuki_lt2000 ( int unit, struct peer *peer )
/*## ##*/
/*## The CITIZEN T.I.C CO., LTD. JJY receiver JJY200 ##*/
/*## ##*/
/*## server 127.127.40.X mode 4 ##*/
/*## refclock jjy unit X subtype 4 ##*/
/*## ##*/
/*################################################################################################*/
/*################################################################################################*/
......@@ -1904,12 +1904,12 @@ jjy_poll_citizentic_jjy200 ( int unit, struct peer *peer )
/*## ##*/
/*## The Tristate Ltd. GPS clock TS-GPS01 ##*/
/*## ##*/
/*## server 127.127.40.X mode 5 ##*/
/*## refclock jjy unit X subtype 5 ##*/
/*## ##*/
/*################################################################################################*/
/*################################################################################################*/
/* */
/* This clock has NMEA mode and command/respose mode. */
/* This clock has NMEA mode and command/response mode. */
/* When this jjy driver are used, set to command/respose mode of this clock */
/* by the onboard switch SW4, and make sure the LED-Y is tured on. */
/* Other than this JJY driver, the refclock driver type 20, generic NMEA driver, */
......@@ -2259,7 +2259,7 @@ jjy_poll_tristate_gpsclock01 ( int unit, struct peer *peer )
/*## ##*/
/*## The SEIKO TIME SYSTEMS TDC-300 ##*/
/*## ##*/
/*## server 127.127.40.X mode 6 ##*/
/*## refclock jjy unit X subtype 6 ##*/
/*## ##*/
/*################################################################################################*/