chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add non-PPS mode to phc2sys." 

This reverts commit 998093b6f7.
Will apply this patch again, with the correct author info.
master
Richard Cochran 2012-08-30 14:45:50 +02:00
parent 0a5caa8476
commit be87b05f52
1 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
phc2sys.c
View File

@ -85,36 +85,33 @@ static void clock_step(clockid_t clkid, int64_t ns)
fprintf(stderr, "failed to step clock: %m\n"); fprintf(stderr, "failed to step clock: %m\n");
} }
static int read_phc(clockid_t clkid, clockid_t sysclk, int rdelay, int64_t *offset, uint64_t *ts) static int64_t read_phc(clockid_t clkid, clockid_t sysclk, int rdelay)
{ {
struct timespec tsrc, tdst; int64_t offset = 0;
if (clkid == CLOCK_INVALID) { if (clkid == CLOCK_INVALID) {
return 0; return 0;
} }
if (rdelay) {
struct timespec tsrc, tdst;
if (clock_gettime(clkid, &tsrc)) { if (clock_gettime(clkid, &tsrc))
perror("clock_gettime"); perror("clock_gettime");
return 0;
}
if (clock_gettime(sysclk, &tdst)) { if (clock_gettime(sysclk, &tdst))
perror("clock_gettime"); perror("clock_gettime");
return 0;
}
*offset = tdst.tv_sec * NS_PER_SEC - tsrc.tv_sec * NS_PER_SEC + offset = tdst.tv_sec * NS_PER_SEC - tsrc.tv_sec * NS_PER_SEC +
tdst.tv_nsec - tsrc.tv_nsec - rdelay; tdst.tv_nsec - tsrc.tv_nsec - rdelay;
*ts = tdst.tv_sec * NS_PER_SEC + tdst.tv_nsec; }
return offset;
return 1;
} }
struct servo { struct servo {
uint64_t last_ts; uint64_t last_ts;
double drift; double drift;
enum { enum {
SAMPLE_0, SAMPLE_1, SAMPLE_2, SAMPLE_3, SAMPLE_N PPS_0, PPS_1, PPS_2, PPS_3, PPS_N
} state; } state;
}; };
@ -122,34 +119,42 @@ static struct servo servo;
static void do_servo(struct servo *srv, static void do_servo(struct servo *srv,
clockid_t src, clockid_t dst, clockid_t src, clockid_t dst,
int64_t offset, uint64_t ts, double kp, double ki) uint64_t ts, double kp, double ki, int rdelay)
{ {
double ki_term, ppb; double ki_term, ppb;
int64_t delta; int64_t delta, offset, phc;
printf("s%d %lld.%09llu drift %.2f\n", offset = ts % NS_PER_SEC;
srv->state, ts / NS_PER_SEC, ts % NS_PER_SEC, srv->drift); if (offset > NS_PER_SEC / 2) {
offset -= NS_PER_SEC;
}
phc = read_phc(src, dst, rdelay);
printf("s%d %lld.%09llu offset %9lld phc %9lld drift %.2f\n",
srv->state, ts / NS_PER_SEC, ts % NS_PER_SEC,
offset, phc, srv->drift);
switch (srv->state) { switch (srv->state) {
case SAMPLE_0: case PPS_0:
clock_ppb(dst, 0.0); clock_ppb(dst, 0.0);
srv->state = SAMPLE_1; srv->state = PPS_1;
break; break;
case SAMPLE_1: case PPS_1:
srv->state = SAMPLE_2; srv->state = PPS_2;
break; break;
case SAMPLE_2: case PPS_2:
delta = ts - srv->last_ts; delta = ts - srv->last_ts;
offset = delta - NS_PER_SEC; offset = delta - NS_PER_SEC;
srv->drift = offset; srv->drift = offset;
clock_ppb(dst, -offset); clock_ppb(dst, -offset);
srv->state = SAMPLE_3; srv->state = PPS_3;
break; break;
case SAMPLE_3: case PPS_3:
clock_step(dst, -offset); clock_step(dst, -offset);
srv->state = SAMPLE_N; srv->state = PPS_N;
break; break;
case SAMPLE_N: case PPS_N:
ki_term = ki * offset; ki_term = ki * offset;
ppb = kp * offset + srv->drift + ki_term; ppb = kp * offset + srv->drift + ki_term;
if (ppb < min_ppb) { if (ppb < min_ppb) {
@ -166,10 +171,10 @@ static void do_servo(struct servo *srv,
srv->last_ts = ts; srv->last_ts = ts;
} }
static int read_pps(int fd, int64_t *offset, uint64_t *ts) static uint64_t read_pps(int fd)
{ {
struct pps_fdata pfd; struct pps_fdata pfd;
uint64_t ts;
pfd.timeout.sec = 10; pfd.timeout.sec = 10;
pfd.timeout.nsec = 0; pfd.timeout.nsec = 0;
pfd.timeout.flags = ~PPS_TIME_INVALID; pfd.timeout.flags = ~PPS_TIME_INVALID;
@ -177,15 +182,9 @@ static int read_pps(int fd, int64_t *offset, uint64_t *ts)
perror("ioctl PPS_FETCH"); perror("ioctl PPS_FETCH");
return 0; return 0;
} }
ts = pfd.info.assert_tu.sec * NS_PER_SEC;
*ts = pfd.info.assert_tu.sec * NS_PER_SEC; ts += pfd.info.assert_tu.nsec;
*ts += pfd.info.assert_tu.nsec; return ts;
*offset = *ts % NS_PER_SEC;
if (*offset > NS_PER_SEC / 2)
*offset -= NS_PER_SEC;
return 1;
} }
static void usage(char *progname) static void usage(char *progname)
@ -209,9 +208,8 @@ int main(int argc, char *argv[])
double kp = KP, ki = KI; double kp = KP, ki = KI;
char *device = NULL, *progname; char *device = NULL, *progname;
clockid_t src = CLOCK_INVALID, dst = CLOCK_REALTIME; clockid_t src = CLOCK_INVALID, dst = CLOCK_REALTIME;
uint64_t pps_ts, phc_ts; uint64_t ts;
int64_t pps_offset, phc_offset; int c, fd, rdelay = 0;
int c, fd = 0, rdelay = 0;
/* Process the command line arguments. */ /* Process the command line arguments. */
progname = strrchr(argv[0], '/'); progname = strrchr(argv[0], '/');
@ -245,17 +243,15 @@ int main(int argc, char *argv[])
} }
} }
if (!(device || src != CLOCK_INVALID) || dst == CLOCK_INVALID) { if (!device || dst == CLOCK_INVALID) {
usage(progname); usage(progname);
return -1; return -1;
} }
if (device) {
fd = open(device, O_RDONLY); fd = open(device, O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "cannot open %s: %m\n", device); fprintf(stderr, "cannot open %s: %m\n", device);
return -1; return -1;
} }
}
if (src != CLOCK_INVALID) { if (src != CLOCK_INVALID) {
struct timespec now; struct timespec now;
if (clock_gettime(src, &now)) if (clock_gettime(src, &now))
@ -264,21 +260,8 @@ int main(int argc, char *argv[])
perror("clock_settime"); perror("clock_settime");
} }
while (1) { while (1) {
if (fd > 0) { ts = read_pps(fd);
if (!read_pps(fd, &pps_offset, &pps_ts)) do_servo(&servo, src, dst, ts, kp, ki, rdelay);
continue;
printf("pps %9lld ", pps_offset);
} else
usleep(1000000);
if (!read_phc(src, dst, rdelay, &phc_offset, &phc_ts))
continue;
printf("phc %9lld ", phc_offset);
if (fd > 0)
do_servo(&servo, src, dst, pps_offset, pps_ts, kp, ki);
else
do_servo(&servo, src, dst, phc_offset, phc_ts, kp, ki);
} }
return 0; return 0;
} }