[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Thu Aug 2 08:42:35 UTC 2012


#### ChangeSet ####
2012-08-02 04:41:05-04:00, stenn at deacon.udel.edu
  [Bug 2247] Get rid of the TRAK refclock - deprecated since 2006

==== BitKeeper/deleted/50/refclock_trak.c~3aed0663 ====
2012-08-02 04:37:52-04:00, stenn at deacon.udel.edu +0 -0
  Delete: ntpd/refclock_trak.c

==== ChangeLog ====
2012-08-02 04:40:49-04:00, stenn at deacon.udel.edu +1 -0
  [Bug 2247] Get rid of the TRAK refclock - deprecated since 2006

--- 1.1201/ChangeLog	2012-08-02 04:34:35 -04:00
+++ 1.1202/ChangeLog	2012-08-02 04:40:49 -04:00
@@ -1,5 +1,6 @@
 * [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.
 * [Bug 2075] Fix spelling of 'incompatible'.
+* [Bug 2247] Get rid of the TRAK refclock - deprecated since 2006.
 * Clean up an exit status in ntpq.c.
 (4.2.7p291) 2012/07/31 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2241] MDNS registration should only happen if requested.

==== configure.ac ====
2012-08-02 04:40:49-04:00, stenn at deacon.udel.edu +0 -11
  [Bug 2247] Get rid of the TRAK refclock - deprecated since 2006

--- 1.547/configure.ac	2012-07-19 19:25:22 -04:00
+++ 1.548/configure.ac	2012-08-02 04:40:49 -04:00
@@ -2419,17 +2419,6 @@ case "$ntp_ok$ac_cv_header_sys_tpro" in
  yesno) AC_MSG_WARN([*** But the expected answer is... no ***])
 esac
 
-dnl Bug 342: longstanding unfixed bugs
-dnl AC_MSG_CHECKING([TRAK 8810 GPS receiver])
-dnl AC_ARG_ENABLE([TRAK],
-dnl     [AS_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])
 AC_ARG_ENABLE(

==== ntpd/Makefile.am ====
2012-08-02 04:40:49-04:00, stenn at deacon.udel.edu +0 -1
  [Bug 2247] Get rid of the TRAK refclock - deprecated since 2006

--- 1.115/ntpd/Makefile.am	2012-04-09 01:25:10 -04:00
+++ 1.116/ntpd/Makefile.am	2012-08-02 04:40:49 -04:00
@@ -123,7 +123,6 @@ EXTRA_DIST =			\
 	ntpd.mdoc.in		\
 	ntpdbase-opts.def	\
 	refclock_msfees.c	\
-	refclock_trak.c		\
 	$(B_S_DIST)		\
 	$(NULL)
 

#### ChangeSet ####
2012-08-02 04:35:10-04:00, stenn at deacon.udel.edu
  [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS

==== ChangeLog ====
2012-08-02 04:34:35-04:00, stenn at deacon.udel.edu +1 -0
  [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS

--- 1.1200/ChangeLog	2012-08-02 02:32:51 -04:00
+++ 1.1201/ChangeLog	2012-08-02 04:34:35 -04:00
@@ -1,3 +1,4 @@
+* [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.
 * [Bug 2075] Fix spelling of 'incompatible'.
 * Clean up an exit status in ntpq.c.
 (4.2.7p291) 2012/07/31 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/ntp_refclock.c ====
2012-08-02 04:35:00-04:00, stenn at deacon.udel.edu +1 -6
  [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS

--- 1.115/ntpd/ntp_refclock.c	2012-02-22 00:05:02 -05:00
+++ 1.116/ntpd/ntp_refclock.c	2012-08-02 04:35:00 -04:00
@@ -61,9 +61,6 @@
 #define FUDGEFAC	.1	/* fudge correction factor */
 #define LF		0x0a	/* ASCII LF */
 
-#ifdef PPS	/* fdpps still ref'd by refclock_zyfer.c */
-int	fdpps;			/* ppsclock legacy */
-#endif /* PPS */
 int	cal_enable;		/* enable refclock calibrate */
 
 /*
@@ -805,9 +802,7 @@ refclock_setup(
 {
 	int	i;
 	TTY	ttyb, *ttyp;
-#ifdef PPS		/* fdpps referenced by refclock_zyfer.c */
-	fdpps = fd;		/* ppsclock legacy */
-#endif /* PPS */
+
 	/*
 	 * By default, the serial line port is initialized in canonical
 	 * (line-oriented) mode at specified line speed, 8 bits and no

==== ntpd/refclock_zyfer.c ====
2012-08-02 04:35:00-04:00, stenn at deacon.udel.edu +1 -18
  [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS

--- 1.9/ntpd/refclock_zyfer.c	2011-04-09 02:20:31 -04:00
+++ 1.10/ntpd/refclock_zyfer.c	2012-08-02 04:35:00 -04:00
@@ -210,16 +210,6 @@ zyfer_receive(
 	int tfom;		/* Time Figure Of Merit */
 	int omode;		/* Operation mode */
 	u_char *p;
-#ifdef PPS
-	struct ppsclockev ppsev;
-	int request;
-#ifdef HAVE_CIOGETEV
-        request = CIOGETEV;
-#endif
-#ifdef HAVE_TIOCGPPSEV
-        request = TIOCGPPSEV;
-#endif
-#endif /* PPS */
 
 	peer = rbufp->recv_peer;
 	pp = peer->procptr;
@@ -292,14 +282,7 @@ zyfer_receive(
 		pp->leap = LEAP_NOTINSYNC;
 		return;
 	}
-#ifdef PPS
-	if(ioctl(fdpps,request,(caddr_t) &ppsev) >=0) {
-		ppsev.tv.tv_sec += (u_int32) JAN_1970;
-		TVTOTS(&ppsev.tv,&up->tstamp);
-	}
-	/* record the last ppsclock event time stamp */
-	pp->lastrec = up->tstamp;
-#endif /* PPS */
+
 	if (!refclock_process(pp)) {
 		refclock_report(peer, CEVNT_BADTIME);
 		return;


More information about the bk-ntp-dev-send mailing list