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

phc2sys: Open PPS device sooner. 

Possible error messages should be printed before waiting on ptp4l.

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
master
Miroslav Lichvar 2013-02-05 17:36:07 +01:00 committed by Richard Cochran
parent 7f760ceac8
commit 11fa191505
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phc2sys.c
View File

@ -203,21 +203,14 @@ static int read_pps(int fd, int64_t *offset, uint64_t *ts)
return 1; return 1;
} }
static int do_pps_loop(struct clock *clock, char *pps_device, static int do_pps_loop(struct clock *clock, int fd,
clockid_t src, int n_readings, int sync_offset) clockid_t src, int n_readings, int sync_offset)
{ {
int64_t pps_offset, phc_offset; int64_t pps_offset, phc_offset;
uint64_t pps_ts, phc_ts; uint64_t pps_ts, phc_ts;
int fd;
clock->source_label = "pps"; clock->source_label = "pps";
fd = open(pps_device, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "cannot open '%s': %m\n", pps_device);
return -1;
}
while (1) { while (1) {
if (!read_pps(fd, &pps_offset, &pps_ts)) { if (!read_pps(fd, &pps_offset, &pps_ts)) {
continue; continue;
@ -433,9 +426,9 @@ static void usage(char *progname)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *device = NULL, *progname, *ethdev = NULL; char *progname, *ethdev = NULL;
clockid_t src = CLOCK_INVALID; clockid_t src = CLOCK_INVALID;
int c, phc_readings = 5, phc_rate = 1, sync_offset = 0; int c, phc_readings = 5, phc_rate = 1, sync_offset = 0, pps_fd = -1;
int wait_sync = 0, forced_sync_offset = 0; int wait_sync = 0, forced_sync_offset = 0;
double ppb; double ppb;
struct clock dst_clock = { struct clock dst_clock = {
@ -455,7 +448,12 @@ int main(int argc, char *argv[])
dst_clock.clkid = clock_open(optarg); dst_clock.clkid = clock_open(optarg);
break; break;
case 'd': case 'd':
device = optarg; pps_fd = open(optarg, O_RDONLY);
if (pps_fd < 0) {
fprintf(stderr,
"cannot open '%s': %m\n", optarg);
return -1;
}
break; break;
case 's': case 's':
src = clock_open(optarg); src = clock_open(optarg);
@ -511,9 +509,9 @@ int main(int argc, char *argv[])
sprintf(phc_device, "/dev/ptp%d", ts_info.phc_index); sprintf(phc_device, "/dev/ptp%d", ts_info.phc_index);
src = clock_open(phc_device); src = clock_open(phc_device);
} }
if (!(device || src != CLOCK_INVALID) || if (!(pps_fd >= 0 || src != CLOCK_INVALID) ||
dst_clock.clkid == CLOCK_INVALID || dst_clock.clkid == CLOCK_INVALID ||
(device && dst_clock.clkid != CLOCK_REALTIME)) { (pps_fd >= 0 && dst_clock.clkid != CLOCK_REALTIME)) {
usage(progname); usage(progname);
return -1; return -1;
} }
@ -544,8 +542,8 @@ int main(int argc, char *argv[])
dst_clock.servo = servo_create(CLOCK_SERVO_PI, -ppb, max_ppb, 0); dst_clock.servo = servo_create(CLOCK_SERVO_PI, -ppb, max_ppb, 0);
if (device) if (pps_fd >= 0)
return do_pps_loop(&dst_clock, device, src, return do_pps_loop(&dst_clock, pps_fd, src,
phc_readings, sync_offset); phc_readings, sync_offset);
if (dst_clock.clkid == CLOCK_REALTIME && if (dst_clock.clkid == CLOCK_REALTIME &&