-rw-r--r--   1 pb       staff       1525 Jul 17 10:29 ./lib/clocktypes.c
-r--r--r--   1 pb       staff       1528 Jul 13 04:35 ./lib/clocktypes.c.premsf
*** ./lib/clocktypes.c.premsf	Tue Jul 13 04:35:25 1993
--- ./lib/clocktypes.c	Sat Jul 17 10:29:14 1993
***************
*** 22,28 ****
  	{ REFCLK_OMEGA_TRUETIME, "True Time OMEGA clock (11)",     "OMEGA_TRUE" },
  	{ REFCLK_IRIG_TPRO,	"Odetics/KSI TPRO IRIG-B (12)",    "IRIG_TPRO" },
  	{ REFCLK_ATOM_LEITCH,	"Leitch CSD 5300 Master Clock (13)", "ATOM_LEITCH" },
! 	{ REFCLK_MSF_EES,	"Reserved for Piete Brooks (14)",  "MSF" },
  	{ -1,			"", "" }
  };
  
--- 22,28 ----
  	{ REFCLK_OMEGA_TRUETIME, "True Time OMEGA clock (11)",     "OMEGA_TRUE" },
  	{ REFCLK_IRIG_TPRO,	"Odetics/KSI TPRO IRIG-B (12)",    "IRIG_TPRO" },
  	{ REFCLK_ATOM_LEITCH,	"Leitch CSD 5300 Master Clock (13)", "ATOM_LEITCH" },
! 	{ REFCLK_MSF_EES,	"MSF EES M201, UK (14)",	   "MSF_EES" },
  	{ -1,			"", "" }
  };
  
-rw-r--r--   1 pb       staff       8943 Jul 24 08:22 ./lib/systime.c
-r--r--r--   1 pb       staff       8788 Jul 16 05:06 ./lib/systime.c.dist
*** ./lib/systime.c.dist	Fri Jul 16 05:06:05 1993
--- ./lib/systime.c	Sat Jul 24 08:22:04 1993
***************
*** 199,204 ****
--- 199,206 ----
  	return 1;
  }
  
+ int	max_no_complete	= 20;
+ 
  /*
   * adj_systime - called once every 1<<CLOCK_ADJ seconds to make system time
   *		 adjustments.
***************
*** 314,320 ****
  		oadjtv.tv_usec);
  #endif /* DEBUGRS6000 */
  
! 	if (oadjtv.tv_sec != 0 || oadjtv.tv_usec != 0) {
  		sTVTOTS(&oadjtv, &oadjts);
  		L_ADD(&sys_clock_offset, &oadjts);
  		syslog(LOG_WARNING, "Previous time adjustment didn't complete");
--- 316,322 ----
  		oadjtv.tv_usec);
  #endif /* DEBUGRS6000 */
  
! 	if ((oadjtv.tv_sec != 0 || oadjtv.tv_usec != 0) && (max_no_complete > 0)) {
  		sTVTOTS(&oadjtv, &oadjts);
  		L_ADD(&sys_clock_offset, &oadjts);
  		syslog(LOG_WARNING, "Previous time adjustment didn't complete");
***************
*** 324,329 ****
--- 326,333 ----
  			    "Previous adjtime() incomplete, residual = %s\n",
  			    tvtoa(&oadjtv));
  #endif
+ 		if (--max_no_complete == 0) syslog(LOG_WARNING,
+ 			"*** No more 'Prev time adj didn't complete'");
  	}
  	return(rval);
  }
-rw-r--r--   1 pb       staff      61878 Jul 17 11:16 ./ntpq/ntpq.c
-r--r--r--   1 pb       staff      61901 Jul 06 18:52 ./ntpq/ntpq.c.ln
*** ./ntpq/ntpq.c.ln	Tue Jul  6 18:52:07 1993
--- ./ntpq/ntpq.c	Sat Jul 17 11:16:57 1993
***************
*** 1549,1558 ****
  {
  	if (!showhostnames)
  		return numtoa(netnum);
- #ifdef REFCLOCK
  	if ((ntohl(netnum) & REFCLOCK_MASK) == REFCLOCK_ADDR)
  	        return refnumtoa(netnum);
- #endif
  	return numtohost(netnum);
  }
  
--- 1549,1556 ----
-rw-r--r--   1 pb       staff      31787 Jul 17 11:36 ./xntpdc/ntpdc.c
-r--r--r--   1 pb       staff      31810 Jul 06 18:52 ./xntpdc/ntpdc.c.ln
*** ./xntpdc/ntpdc.c.ln	Tue Jul  6 18:52:48 1993
--- ./xntpdc/ntpdc.c	Sat Jul 17 11:36:17 1993
***************
*** 1107,1116 ****
  {
  	if (!showhostnames)
  		return numtoa(netnum);
- #ifdef REFCLOCK
  	if ((ntohl(netnum) & REFCLOCK_MASK) == REFCLOCK_ADDR)
  	        return refnumtoa(netnum);
- #endif
  	return numtohost(netnum);
  }
  
--- 1107,1114 ----
-r--r--r--   1 pb       staff       6554 Jul 17 07:34 ./LIST.files-t
*** ../src-alpha/xntpd/refclock_conf.c	Tue Jul 13 04:43:42 1993
--- xntpd/refclock_conf.c	Tue Jul 20 21:51:25 1993
***************
*** 85,94 ****
  #define refclock_irig	refclock_none
  #endif
  
! #if defined(MSF) || defined(MSFCLK) || defined(MSFPPS)
! extern	struct refclock		refclock_msf;
  #else
! #define refclock_msf	refclock_none
  #endif
  
  /*
--- 85,94 ----
  #define refclock_irig	refclock_none
  #endif
  
! #if defined(MSFEES) || defined(MSFEESCLK) || defined(MSFEESPPS)
! extern	struct refclock		refclock_msfees;
  #else
! #define refclock_msfees	refclock_none
  #endif
  
  /*
***************
*** 112,118 ****
  	&refclock_omega,	/* 11 REFCLK_OMEGA_TRUETIME */
          &refclock_tpro,		/* 12 REFCLK_IRIG_TPRO */
  	&refclock_leitch,	/* 13 REFCLK_ATOM_LEITCH */
! 	&refclock_msf,		/* 14 REFCLK_MSF_EES */
  };
  
  int num_refclock_conf = sizeof(refclock_conf)/sizeof(struct refclock *);
--- 112,118 ----
  	&refclock_omega,	/* 11 REFCLK_OMEGA_TRUETIME */
          &refclock_tpro,		/* 12 REFCLK_IRIG_TPRO */
  	&refclock_leitch,	/* 13 REFCLK_ATOM_LEITCH */
! 	&refclock_msfees,	/* 14 REFCLK_MSF_EES */
  };
  
  int num_refclock_conf = sizeof(refclock_conf)/sizeof(struct refclock *);
