[Bug 340, 342] Deprecate broken TRAK and MSF EES refclocks

bk: 44f5686bq7bx-LRgI9PYSdneKXAksA

diff --git a/NEWS b/NEWS
index d2f0a3cfec4f88697dec2f57566ee7f555cb9efa..939fe56cbdbed9c33150544bbd1d42eeac14e675 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* [Bug 342] Deprecate broken TRAK refclock driver
+* [Bug 340] Deprecate broken MSF EES refclock driver
 * Support separate PPS devices for PARSE refclocks
 * [Bug 637, 51?] Dynamic interface scanning can now be done
 * Options processing now uses GNU AutoGen

diff --git a/configure.ac b/configure.ac
index e5c018f67f20ccc2c61f89f69a0482068855e02d..5003d72732c2d184736fd72a6161e5ef038e26b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2355,15 +2355,16 @@ if test "$ntp_ok" = "yes"; then
 fi
 AC_MSG_RESULT($ntp_ok)
 
-AC_MSG_CHECKING(EES M201 MSF receiver)
-AC_ARG_ENABLE(MSFEES,
-    AC_HELP_STRING([--enable-MSFEES], [+ EES M201 MSF receiver]),
-    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
-if test "$ntp_ok" = "yes"; then
-    ntp_refclock=yes
-    AC_DEFINE(CLOCK_MSFEES, 1, [EES M201 MSF receiver])
-fi
-AC_MSG_RESULT($ntp_ok)
+dnl Bug 340: longstanding unfixed bugs
+dnl AC_MSG_CHECKING(EES M201 MSF receiver)
+dnl AC_ARG_ENABLE(MSFEES,
+dnl     AC_HELP_STRING([--enable-MSFEES], [+ EES M201 MSF receiver]),
+dnl     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+dnl if test "$ntp_ok" = "yes"; then
+dnl     ntp_refclock=yes
+dnl     AC_DEFINE(CLOCK_MSFEES, 1, [EES M201 MSF receiver])
+dnl fi
+dnl AC_MSG_RESULT($ntp_ok)
 
 # Not Ultrix
 AC_MSG_CHECKING(Magnavox MX4200 GPS receiver)
@@ -2516,15 +2517,16 @@ case "$ntp_ok$ac_cv_header_sys_tpro" in
  yesno) AC_MSG_WARN(*** But the expected answer is... no ***) ;;
 esac
 
-AC_MSG_CHECKING(TRAK 8810 GPS receiver)
-AC_ARG_ENABLE(TRAK,
-    AC_HELP_STRING([--enable-TRAK], [+ TRAK 8810 GPS receiver]),
-    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
-if test "$ntp_ok" = "yes"; then
-    ntp_refclock=yes
-    AC_DEFINE(CLOCK_TRAK, 1, [TRAK 8810 GPS receiver])
-fi
-AC_MSG_RESULT($ntp_ok)
+dnl Bug 342: longstanding unfixed bugs
+dnl AC_MSG_CHECKING(TRAK 8810 GPS receiver)
+dnl AC_ARG_ENABLE(TRAK,
+dnl     AC_HELP_STRING([--enable-TRAK], [+ TRAK 8810 GPS receiver]),
+dnl     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+dnl if test "$ntp_ok" = "yes"; then
+dnl     ntp_refclock=yes
+dnl     AC_DEFINE(CLOCK_TRAK, 1, [TRAK 8810 GPS receiver])
+dnl fi
+dnl AC_MSG_RESULT($ntp_ok)
 
 # Not on a vax-dec-bsd
 AC_MSG_CHECKING(Kinemetrics/TrueTime receivers)

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 4321191e3a6d454bb1fdffb77d55b50826e33d40..6809020e899d84b845bec17c2957265b3146d313 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -26,7 +26,10 @@ ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ $(LIBOPTS_LDADD)
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
 DISTCLEANFILES = .version version.c
-EXTRA_DIST = ntpd-opts.def ntpdbase-opts.def ntpdsim-opts.def $(BUILT_SOURCES)
+EXTRA_DIST = ntpd-opts.def ntpdbase-opts.def ntpdsim-opts.def  \
+       refclock_msfees.c       \
+       refclock_trak.c         \
+       $(BUILT_SOURCES)
 ETAGS_ARGS = Makefile.am
 ###                                                    Y2Kfixes
 check_PROGRAMS = @MAKE_CHECK_Y2K@
@@ -55,11 +58,11 @@ libntpd_a_SOURCES = jupiter.h ntp_control.c \
        refclock_fg.c refclock_gpsvme.c refclock_heath.c refclock_hopfser.c \
        refclock_hopfpci.c refclock_hpgps.c refclock_irig.c refclock_jjy.c \
        refclock_jupiter.c refclock_leitch.c refclock_local.c \
-       refclock_msfees.c refclock_mx4200.c refclock_neoclock4x.c \
+       refclock_mx4200.c refclock_neoclock4x.c \
        refclock_nmea.c refclock_oncore.c refclock_palisade.c \
        refclock_palisade.h refclock_parse.c \
        refclock_pcf.c refclock_pst.c refclock_ripencc.c refclock_shm.c \
-       refclock_tpro.c refclock_trak.c refclock_true.c refclock_tt560.c \
+       refclock_tpro.c refclock_true.c refclock_tt560.c \
        refclock_ulink.c refclock_wwv.c refclock_wwvb.c \
        refclock_zyfer.c
 

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 56d76e8b44dc8dd2928f8c224b557f254d91c787..64603d37f527c74c2154ec718fa320a7f08e5b39 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -363,11 +363,11 @@ int num_ctl_traps;
 static u_char clocktypes[] = {
        CTL_SST_TS_NTP,         /* REFCLK_NONE (0) */
        CTL_SST_TS_LOCAL,       /* REFCLK_LOCALCLOCK (1) */
-       CTL_SST_TS_UHF,         /* REFCLK_GPS_TRAK (2) */
+       CTL_SST_TS_UHF,         /* deprecated REFCLK_GPS_TRAK (2) */
        CTL_SST_TS_HF,          /* REFCLK_WWV_PST (3) */
        CTL_SST_TS_LF,          /* REFCLK_WWVB_SPECTRACOM (4) */
        CTL_SST_TS_UHF,         /* REFCLK_TRUETIME (5) */
-       CTL_SST_TS_UHF,         /* REFCLK_GOES_TRAK (6) */
+       CTL_SST_TS_UHF,         /* REFCLK_GOES_TRAK (6) IRIG_AUDIO? */
        CTL_SST_TS_HF,          /* REFCLK_CHU (7) */
        CTL_SST_TS_LF,          /* REFCLOCK_PARSE (default) (8) */
        CTL_SST_TS_LF,          /* REFCLK_GPS_MX4200 (9) */
@@ -375,7 +375,7 @@ static u_char clocktypes[] = {
        CTL_SST_TS_UHF,         /* REFCLK_GPS_ARBITER (11) */
        CTL_SST_TS_UHF,         /* REFCLK_IRIG_TPRO (12) */
        CTL_SST_TS_ATOM,        /* REFCLK_ATOM_LEITCH (13) */
-       CTL_SST_TS_LF,          /* REFCLK_MSF_EES (14) */
+       CTL_SST_TS_LF,          /* deprecated REFCLK_MSF_EES (14) */
        CTL_SST_TS_NTP,         /* not used (15) */
        CTL_SST_TS_UHF,         /* REFCLK_IRIG_BANCOMM (16) */
        CTL_SST_TS_UHF,         /* REFCLK_GPS_DATU (17) */

diff --git a/ntpd/refclock_conf.c b/ntpd/refclock_conf.c
index 54a76e16199967633f4060647630afae30744d4f..dc29d1e798fecf804c435b44e5b1fa88f9298427 100644 (file)
--- a/ntpd/refclock_conf.c
+++ b/ntpd/refclock_conf.c
@@ -24,7 +24,7 @@ extern        struct refclock refclock_local;
 #define        refclock_local  refclock_none
 #endif
 
-#if defined(CLOCK_TRAK) && defined(PPS)
+#if 0 && defined(CLOCK_TRAK) && defined(PPS)
 extern struct refclock refclock_trak;
 #else
 #define        refclock_trak   refclock_none
@@ -96,7 +96,7 @@ extern        struct refclock refclock_irig;
 #define refclock_irig  refclock_none
 #endif
 
-#if defined(CLOCK_MSFEES) && defined(PPS)
+#if 0 && defined(CLOCK_MSFEES) && defined(PPS)
 extern struct refclock refclock_msfees;
 #else
 #define refclock_msfees        refclock_none
@@ -267,7 +267,7 @@ extern      struct refclock refclock_neoclock4x;
 struct refclock *refclock_conf[] = {
        &refclock_none,         /* 0 REFCLK_NONE */
        &refclock_local,        /* 1 REFCLK_LOCAL */
-       &refclock_trak,         /* 2 REFCLK_GPS_TRAK */
+       &refclock_none,         /* 2 deprecated: REFCLK_GPS_TRAK */
        &refclock_pst,          /* 3 REFCLK_WWV_PST */
        &refclock_wwvb,         /* 4 REFCLK_SPECTRACOM */
        &refclock_true,         /* 5 REFCLK_TRUETIME */
@@ -279,7 +279,7 @@ struct refclock *refclock_conf[] = {
        &refclock_arbiter,      /* 11 REFCLK_GPS_ARBITER */
        &refclock_tpro,         /* 12 REFCLK_IRIG_TPRO */
        &refclock_leitch,       /* 13 REFCLK_ATOM_LEITCH */
-       &refclock_msfees,       /* 14 REFCLK_MSF_EES */
+       &refclock_none,         /* 14 deprecated: REFCLK_MSF_EES */
        &refclock_none,         /* 15 not used */
        &refclock_bancomm,      /* 16 REFCLK_IRIG_BANCOMM */
        &refclock_datum,        /* 17 REFCLK_GPS_DATUM */