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

phc2sys: Change update rate parameter to floating-point. 

This allows update intervals longer than 1 second.

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
master
Miroslav Lichvar 2013-04-24 15:49:11 +02:00 committed by Richard Cochran
parent 3414d99609
commit 9c83fcb3c9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phc2sys.c
View File

@ -286,7 +286,7 @@ static int do_pps_loop(struct clock *clock, int fd,
} }
static int do_sysoff_loop(struct clock *clock, clockid_t src, static int do_sysoff_loop(struct clock *clock, clockid_t src,
int rate, int n_readings) double rate, int n_readings)
{ {
uint64_t ts; uint64_t ts;
int64_t offset, delay; int64_t offset, delay;
@ -306,7 +306,7 @@ static int do_sysoff_loop(struct clock *clock, clockid_t src,
} }
static int do_phc_loop(struct clock *clock, clockid_t src, static int do_phc_loop(struct clock *clock, clockid_t src,
int rate, int n_readings) double rate, int n_readings)
{ {
uint64_t ts; uint64_t ts;
int64_t offset, delay; int64_t offset, delay;
@ -539,7 +539,7 @@ static void usage(char *progname)
" -P [kp] proportional constant (0.7)\n" " -P [kp] proportional constant (0.7)\n"
" -I [ki] integration constant (0.3)\n" " -I [ki] integration constant (0.3)\n"
" -S [step] step threshold (disabled)\n" " -S [step] step threshold (disabled)\n"
" -R [rate] slave clock update rate in HZ (1)\n" " -R [rate] slave clock update rate in HZ (1.0)\n"
" -N [num] number of master clock readings per update (5)\n" " -N [num] number of master clock readings per update (5)\n"
" -O [offset] slave-master time offset (0)\n" " -O [offset] slave-master time offset (0)\n"
" -u [num] number of clock updates in summary stats (0)\n" " -u [num] number of clock updates in summary stats (0)\n"
@ -559,10 +559,10 @@ int main(int argc, char *argv[])
{ {
char *progname, *ethdev = NULL; char *progname, *ethdev = NULL;
clockid_t src = CLOCK_INVALID; clockid_t src = CLOCK_INVALID;
int c, domain_number = 0, phc_readings = 5, phc_rate = 1, pps_fd = -1; int c, domain_number = 0, phc_readings = 5, pps_fd = -1;
int max_ppb, r, wait_sync = 0, forced_sync_offset = 0; int max_ppb, r, wait_sync = 0, forced_sync_offset = 0;
int print_level = LOG_INFO, use_syslog = 1, verbose = 0; int print_level = LOG_INFO, use_syslog = 1, verbose = 0;
double ppb; double ppb, phc_rate = 1.0;
struct clock dst_clock = { struct clock dst_clock = {
.clkid = CLOCK_REALTIME, .clkid = CLOCK_REALTIME,
.servo_state = SERVO_UNLOCKED, .servo_state = SERVO_UNLOCKED,
@ -602,7 +602,7 @@ int main(int argc, char *argv[])
configured_pi_offset = atof(optarg); configured_pi_offset = atof(optarg);
break; break;
case 'R': case 'R':
phc_rate = atoi(optarg); phc_rate = atof(optarg);
break; break;
case 'N': case 'N':
phc_readings = atoi(optarg); phc_readings = atoi(optarg);