[ntp:bk-ntp-stable-send] BitKeeper patch
Harlan Stenn
stenn at whimsy.udel.edu
Fri Nov 21 23:49:16 PST 2003
This BitKeeper patch contains the following changesets:
peda at sectra.se|ChangeSet|20031022110828|17642
peda at sectra.se|ChangeSet|20031022111210|17644
peda at sectra.se|ChangeSet|20031022111639|17636
stenn at whimsy.udel.edu|ChangeSet|20031122074738|18775
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID: stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User: stenn
# Host: whimsy.udel.edu
# Root: /backroom/ntp-stable
#
#--- 1.14/ntpd/refclock_jupiter.c Mon Oct 6 13:33:49 2003
#+++ 1.17/ntpd/refclock_jupiter.c Wed Oct 22 07:16:36 2003
#@@ -121,6 +121,7 @@
# pps_info_t pps_info; /* last pps data */
# pps_handle_t pps_handle; /* pps handle */
# u_int assert; /* pps edge to use */
#+ u_int hardpps; /* enable kernel mode */
# struct timespec ts; /* last timestamp */
# #endif
# l_fp limit;
#@@ -152,7 +153,7 @@
# static void jupiter_control P((int, struct refclockstat *, struct
# refclockstat *, struct peer *));
# #ifdef HAVE_PPSAPI
#-static int jupiter_ppsapi P((struct instance *, int, int));
#+static int jupiter_ppsapi P((struct instance *));
# static int jupiter_pps P((struct instance *));
# #endif /* HAVE_PPSAPI */
# static int jupiter_recv P((struct instance *));
#@@ -229,6 +230,8 @@
# memcpy((char *)&pp->refid, REFID, 4);
#
# #ifdef HAVE_PPSAPI
#+ instance->assert = 1;
#+ instance->hardpps = 0;
# /*
# * Start the PPSAPI interface if it is there. Default to use
# * the assert edge and do not enable the kernel hardpps.
#@@ -238,7 +241,7 @@
# msyslog(LOG_ERR,
# "refclock_jupiter: time_pps_create failed: %m");
# }
#- else if (!jupiter_ppsapi(instance, 0, 0))
#+ else if (!jupiter_ppsapi(instance))
# goto clean_up;
# #endif /* HAVE_PPSAPI */
#
#@@ -265,7 +268,7 @@
#
# pp = peer->procptr;
# instance = (struct instance *)pp->unitptr;
#- if(!instance)
#+ if (!instance)
# return;
#
# #ifdef HAVE_PPSAPI
#@@ -336,9 +339,7 @@
# */
# int
# jupiter_ppsapi(
#- struct instance *instance, /* unit structure pointer */
#- int enb_clear, /* clear enable */
#- int enb_hardpps /* hardpps enable */
#+ struct instance *instance /* unit structure pointer */
# )
# {
# int capability;
#@@ -349,14 +350,14 @@
# return (0);
# }
# memset(&instance->pps_params, 0, sizeof(pps_params_t));
#- if (enb_clear)
#+ if (!instance->assert)
# instance->pps_params.mode = capability & PPS_CAPTURECLEAR;
# else
# instance->pps_params.mode = capability & PPS_CAPTUREASSERT;
# if (!(instance->pps_params.mode & (PPS_CAPTUREASSERT | PPS_CAPTURECLEAR))) {
# msyslog(LOG_ERR,
# "refclock_jupiter: invalid capture edge %d",
#- !enb_clear);
#+ instance->assert);
# return (0);
# }
# instance->pps_params.mode |= PPS_TSFMT_TSPEC;
#@@ -365,9 +366,9 @@
# "refclock_jupiter: time_pps_setparams failed: %m");
# return (0);
# }
#- if (enb_hardpps) {
#+ if (instance->hardpps) {
# if (time_pps_kcbind(instance->pps_handle, PPS_KC_HARDPPS,
#- instance->pps_params.mode & (PPS_CAPTUREASSERT | PPS_CAPTURECLEAR),
#+ instance->pps_params.mode & ~PPS_TSFMT_TSPEC,
# PPS_TSFMT_TSPEC) < 0) {
# msyslog(LOG_ERR,
# "refclock_jupiter: time_pps_kcbind failed: %m");
#@@ -383,7 +384,7 @@
# jupiter_debug(instance->peer, "refclock_jupiter",
# "pps capability 0x%x version %d mode 0x%x kern %d",
# capability, instance->pps_params.api_version,
#- instance->pps_params.mode, enb_hardpps);
#+ instance->pps_params.mode, instance->hardpps);
# }
# #endif
#
#@@ -503,7 +504,7 @@
#
# #ifdef HAVE_PPSAPI
# instance->assert = !(pp->sloppyclockflag & CLK_FLAG3);
#- jupiter_ppsapi(instance, !instance->assert, 0);
#+ jupiter_ppsapi(instance);
# #endif /* HAVE_PPSAPI */
#
# sloppyclockflag = instance->sloppyclockflag;
#@@ -688,7 +689,7 @@
# "jupiter_receive", "%s chan ver %s, %s (%s)",
# ip->chans, ip->vers, ip->date, ip->opts);
# msyslog(LOG_DEBUG,
#- "jupiter_receive: %s chan ver %s, %s (%s)\n",
#+ "jupiter_receive: %s chan ver %s, %s (%s)",
# ip->chans, ip->vers, ip->date, ip->opts);
# if (instance->wantid)
# instance->wantid = 0;
#@@ -953,8 +954,8 @@
# } reqmsg = {
# { putshort(JUPITER_SYNC), 0,
# putshort((sizeof(struct jrequest) / sizeof(u_short)) - 1),
#- 0, (u_char)putshort(JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK |
#- JUPITER_FLAG_CONN | JUPITER_FLAG_LOG), 0 },
#+ 0, JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK |
#+ JUPITER_FLAG_CONN | JUPITER_FLAG_LOG, 0 },
# { 0, 0, 0, 0 }
# };
#
#@@ -979,7 +980,7 @@
# /* Cancel periodic message output */
# static struct jheader canmsg = {
# putshort(JUPITER_SYNC), 0, 0, 0,
#- (u_char)putshort(JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_DISC),
#+ JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_DISC,
# 0
# };
#
#@@ -998,7 +999,7 @@
# /* Request a single message output */
# static struct jheader reqonemsg = {
# putshort(JUPITER_SYNC), 0, 0, 0,
#- (u_char)putshort(JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_QUERY),
#+ JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_QUERY,
# 0
# };
#
#@@ -1021,7 +1022,7 @@
# } platmsg = {
# { putshort(JUPITER_SYNC), putshort(JUPITER_I_PLAT),
# putshort((sizeof(struct jplat) / sizeof(u_short)) - 1), 0,
#- (u_char)putshort(JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK), 0 },
#+ JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK, 0 },
# { 0, 0, 0 }
# };
#
#
# Diff checksum=dd33a5a3
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031020191002|19108
D 1.1163 03/10/22 13:08:28+02:00 peda at sectra.se +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove annying newline from syslog in the jupiter refclock.
K 17642
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/refclock_jupiter.c|19990526004818|01635|3aed0663 peda at sectra.se|ntpd/refclock_jupiter.c|20031022110826|62525
peda at sectra.se|ChangeSet|20031022110828|17642
D 1.1164 03/10/22 13:12:10+02:00 peda at sectra.se +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Clean up PPS handling in jupiter driver.
c Easier to modify source to get hardpps.
K 17644
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/refclock_jupiter.c|19990526004818|01635|3aed0663 peda at sectra.se|ntpd/refclock_jupiter.c|20031022111208|61884
peda at sectra.se|ChangeSet|20031022111210|17644
D 1.1165 03/10/22 13:16:39+02:00 peda at sectra.se +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes the bug for big endian machines, instead of killing the warning.
K 17636
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/refclock_jupiter.c|19990526004818|01635|3aed0663 peda at sectra.se|ntpd/refclock_jupiter.c|20031022111636|55112
peda at sectra.se|ChangeSet|20031022111639|17636
D 1.1166 03/11/22 02:47:38-05:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge
i blu at corwin.|ChangeSet|20031022151333|16325
i stenn at whimsy.udel.edu|ChangeSet|20031120091400|20284
i stenn at whimsy.udel.edu|ChangeSet|20031120094132|20247
K 18775
M stenn at whimsy.udel.edu|ChangeSet|20031120094132|20247
P ChangeSet
------------------------------------------------
== ntpd/refclock_jupiter.c ==
stenn at whimsy.udel.edu|ntpd/refclock_jupiter.c|19990526004818|01635|3aed0663
fredb at seduction.immanent.net|ntpd/refclock_jupiter.c|20031006173349|62727
D 1.15 03/10/22 13:08:26+02:00 peda at sectra.se +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove annying newline from syslog.
K 62525
O -rw-rw-r--
P ntpd/refclock_jupiter.c
------------------------------------------------
D691 1
I691 1
"jupiter_receive: %s chan ver %s, %s (%s)",
peda at sectra.se|ntpd/refclock_jupiter.c|20031022110826|62525
D 1.16 03/10/22 13:12:08+02:00 peda at sectra.se +13 -12
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Clean up PPS handling.
c Easier to modify source to get hardpps.
K 61884
O -rw-rw-r--
P ntpd/refclock_jupiter.c
------------------------------------------------
I123 1
u_int hardpps; /* enable kernel mode */
D155 1
I155 1
static int jupiter_ppsapi P((struct instance *));
I231 2
instance->assert = 1;
instance->hardpps = 0;
D241 1
I241 1
else if (!jupiter_ppsapi(instance))
D268 1
I268 1
if (!instance)
D339 3
I341 1
struct instance *instance /* unit structure pointer */
D352 1
I352 1
if (!instance->assert)
D359 1
I359 1
instance->assert);
D368 1
I368 1
if (instance->hardpps) {
D370 1
I370 1
instance->pps_params.mode & ~PPS_TSFMT_TSPEC,
D386 1
I386 1
instance->pps_params.mode, instance->hardpps);
D506 1
I506 1
jupiter_ppsapi(instance);
peda at sectra.se|ntpd/refclock_jupiter.c|20031022111208|61884
D 1.17 03/10/22 13:16:36+02:00 peda at sectra.se +5 -5
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes the bug for big endian machines, instead of killing the warning.
K 55112
O -rw-rw-r--
P ntpd/refclock_jupiter.c
------------------------------------------------
D957 2
I958 2
0, JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK |
JUPITER_FLAG_CONN | JUPITER_FLAG_LOG, 0 },
D983 1
I983 1
JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_DISC,
D1002 1
I1002 1
JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK | JUPITER_FLAG_QUERY,
D1025 1
I1025 1
JUPITER_FLAG_REQUEST | JUPITER_FLAG_NAK, 0 },
# Patch checksum=632bb033
More information about the bk-ntp-stable-send
mailing list