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

config: convert 'clockClass' to the new scheme. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2015-08-15 19:27:13 +02:00
parent 0c9d54d3ff
commit a71ecc2816
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.c
View File

@ -95,6 +95,7 @@ struct config_item config_tab[] = {
GLOB_ITEM_INT("assume_two_step", 0, 0, 1), GLOB_ITEM_INT("assume_two_step", 0, 0, 1),
PORT_ITEM_INT("boundary_clock_jbod", 0, 0, 1), PORT_ITEM_INT("boundary_clock_jbod", 0, 0, 1),
GLOB_ITEM_INT("check_fup_sync", 0, 0, 1), GLOB_ITEM_INT("check_fup_sync", 0, 0, 1),
GLOB_ITEM_INT("clockClass", 248, 0, UINT8_MAX),
PORT_ITEM_INT("delayAsymmetry", 0, INT_MIN, INT_MAX), PORT_ITEM_INT("delayAsymmetry", 0, INT_MIN, INT_MAX),
PORT_ITEM_INT("delay_filter_length", 10, 1, INT_MAX), PORT_ITEM_INT("delay_filter_length", 10, 1, INT_MAX),
PORT_ITEM_INT("egressLatency", 0, INT_MIN, INT_MAX), PORT_ITEM_INT("egressLatency", 0, INT_MIN, INT_MAX),
@ -404,12 +405,6 @@ static enum parser_result parse_global_setting(const char *option,
return r; return r;
dds->domainNumber = uval; dds->domainNumber = uval;
} else if (!strcmp(option, "clockClass")) {
r = get_ranged_uint(value, &uval, 0, UINT8_MAX);
if (r != PARSED_OK)
return r;
dds->clockQuality.clockClass = uval;
} else if (!strcmp(option, "clockAccuracy")) { } else if (!strcmp(option, "clockAccuracy")) {
r = get_ranged_uint(value, &uval, 0, UINT8_MAX); r = get_ranged_uint(value, &uval, 0, UINT8_MAX);
if (r != PARSED_OK) if (r != PARSED_OK)

3
ptp4l.c
View File

@ -44,7 +44,6 @@ static struct config cfg_settings = {
.dds = { .dds = {
.dds = { .dds = {
.clockQuality.clockClass = 248,
.clockQuality.clockAccuracy = 0xfe, .clockQuality.clockAccuracy = 0xfe,
.clockQuality.offsetScaledLogVariance = 0xffff, .clockQuality.offsetScaledLogVariance = 0xffff,
.domainNumber = 0, .domainNumber = 0,
@ -223,6 +222,8 @@ int main(int argc, char *argv[])
sk_check_fupsync = config_get_int(cfg, NULL, "check_fup_sync"); sk_check_fupsync = config_get_int(cfg, NULL, "check_fup_sync");
sk_tx_timeout = config_get_int(cfg, NULL, "tx_timestamp_timeout"); sk_tx_timeout = config_get_int(cfg, NULL, "tx_timestamp_timeout");
ds->clockQuality.clockClass = config_get_int(cfg, NULL, "clockClass");
if (config_get_int(cfg, NULL, "slaveOnly")) { if (config_get_int(cfg, NULL, "slaveOnly")) {
ds->flags |= DDS_SLAVE_ONLY; ds->flags |= DDS_SLAVE_ONLY;
ds->clockQuality.clockClass = 248; ds->clockQuality.clockClass = 248;