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

phc2sys: split servo_add from function clock_add 

We also need this part in clock_reinit() later. So split it out of
function clock_add().

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
master
Hangbin Liu 2017-10-09 22:31:48 +08:00 committed by Richard Cochran
parent 8923bcdf64
commit cb53238d5d
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
phc2sys.c
View File

@ -162,12 +162,45 @@ static clockid_t clock_open(char *device, int *phc_index)
return clkid; return clkid;
} }
static struct servo *servo_add(struct node *node, struct clock *clock)
{
double ppb;
int max_ppb;
struct servo *servo;
clockadj_init(clock->clkid);
ppb = clockadj_get_freq(clock->clkid);
/* The reading may silently fail and return 0, reset the frequency to
make sure ppb is the actual frequency of the clock. */
clockadj_set_freq(clock->clkid, ppb);
if (clock->clkid == CLOCK_REALTIME) {
sysclk_set_leap(0);
max_ppb = sysclk_max_freq();
} else {
max_ppb = phc_max_adj(clock->clkid);
if (!max_ppb) {
pr_err("clock is not adjustable");
return NULL;
}
}
servo = servo_create(phc2sys_config, node->servo_type,
-ppb, max_ppb, 0);
if (!servo) {
pr_err("Failed to create servo");
return NULL;
}
servo_sync_interval(servo, node->phc_interval);
return servo;
}
static struct clock *clock_add(struct node *node, char *device) static struct clock *clock_add(struct node *node, char *device)
{ {
struct clock *c; struct clock *c;
clockid_t clkid = CLOCK_INVALID; clockid_t clkid = CLOCK_INVALID;
int max_ppb, phc_index = -1; int phc_index = -1;
double ppb;
if (device) { if (device) {
clkid = clock_open(device, &phc_index); clkid = clock_open(device, &phc_index);
@ -211,25 +244,7 @@ static struct clock *clock_add(struct node *node, char *device)
} }
} }
clockadj_init(c->clkid); c->servo = servo_add(node, c);
ppb = clockadj_get_freq(c->clkid);
/* The reading may silently fail and return 0, reset the frequency to
make sure ppb is the actual frequency of the clock. */
clockadj_set_freq(c->clkid, ppb);
if (c->clkid == CLOCK_REALTIME) {
sysclk_set_leap(0);
max_ppb = sysclk_max_freq();
} else {
max_ppb = phc_max_adj(c->clkid);
if (!max_ppb) {
pr_err("clock is not adjustable");
return NULL;
}
}
c->servo = servo_create(phc2sys_config, node->servo_type,
-ppb, max_ppb, 0);
servo_sync_interval(c->servo, node->phc_interval);
if (clkid != CLOCK_REALTIME) if (clkid != CLOCK_REALTIME)
c->sysoff_supported = (SYSOFF_SUPPORTED == c->sysoff_supported = (SYSOFF_SUPPORTED ==