Skip to content

P
PPSi
Commit 8947973d authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

trivial: renamed foreign_record variables 

No functional change at all, just rename and make var name shorter.
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent bf67f3bf
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
include/ppsi/pp-instance.h
View file @ 8947973d
......@@ -168,9 +168,9 @@ struct pp_instance {
DSTimeProperties *timePropertiesDS; /* page 70 */
unsigned long timeouts[__PP_TO_ARRAY_SIZE];
UInteger16 number_foreign_records;
Integer16 foreign_record_i;
Integer16 foreign_record_best;
UInteger16 frgn_rec_num;
Integer16 frgn_rec_i;
Integer16 frgn_rec_best;
struct pp_frgn_master frgn_master[PP_NR_FOREIGN_RECORDS];
UInteger16 recv_sync_sequence_id;
......
proto-standard/bmc.c
View file @ 8947973d
......@@ -183,7 +183,7 @@ static int bmc_state_decision(struct pp_instance *ppi, struct pp_frgn_master *m)
if (OPTS(ppi)->slave_only)
goto slave;
if ((!ppi->number_foreign_records) && (ppi->state == PPS_LISTENING))
if ((!ppi->frgn_rec_num) && (ppi->state == PPS_LISTENING))
return PPS_LISTENING;
/* copy local information to a foreign_master structure */
......@@ -228,19 +228,19 @@ int bmc(struct pp_instance *ppi)
struct pp_frgn_master *frgn_master = ppi->frgn_master;
int i, best;
if (!ppi->number_foreign_records)
if (!ppi->frgn_rec_num)
if (ppi->state == PPS_MASTER) {
m1(ppi);
return ppi->state;
}
for (i = 1, best = 0; i < ppi->number_foreign_records; i++)
for (i = 1, best = 0; i < ppi->frgn_rec_num; i++)
if (bmc_dataset_cmp(ppi, &frgn_master[i], &frgn_master[best])
< 0)
best = i;
pp_diag(ppi, bmc, 1,"Best foreign master is %i\n", best);
ppi->foreign_record_best = best;
ppi->frgn_rec_best = best;
return bmc_state_decision(ppi, &frgn_master[best]);
}
proto-standard/common-fun.c
View file @ 8947973d
......@@ -45,8 +45,8 @@ int st_com_execute_slave(struct pp_instance *ppi)
return ret;
if (pp_timeout_z(ppi, PP_TO_ANN_RECEIPT)) {
ppi->number_foreign_records = 0;
ppi->foreign_record_i = 0;
ppi->frgn_rec_num = 0;
ppi->frgn_rec_i = 0;
if (!DSDEF(ppi)->slaveOnly &&
DSDEF(ppi)->clockQuality.clockClass != 255) {
m1(ppi);
......@@ -66,7 +66,7 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
MsgHeader *hdr = &ppi->received_ptp_header;
/* Check if foreign master is already known */
for (i = 0; i < ppi->number_foreign_records; i++) {
for (i = 0; i < ppi->frgn_rec_num; i++) {
if (!memcmp(&hdr->sourcePortIdentity,
&ppi->frgn_master[i].port_id,
sizeof(hdr->sourcePortIdentity))) {
......@@ -78,11 +78,11 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
}
/* New foreign master */
if (ppi->number_foreign_records < PP_NR_FOREIGN_RECORDS)
ppi->number_foreign_records++;
if (ppi->frgn_rec_num < PP_NR_FOREIGN_RECORDS)
ppi->frgn_rec_num++;
/* FIXME: replace the worst */
i = ppi->foreign_record_i;
i = ppi->frgn_rec_i;
/* Copy new foreign master data set from announce message */
memcpy(&ppi->frgn_master[i].port_id,
......@@ -97,7 +97,7 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
PP_VPRINTF("New foreign Master added\n");
ppi->foreign_record_i = (ppi->foreign_record_i+1) %
ppi->frgn_rec_i = (ppi->frgn_rec_i+1) %
PP_NR_FOREIGN_RECORDS;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment