Skip to content

P
PPSi
Commit c114cae1 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Aurelio Colosimo
Browse files
Options

proto-standard: checkpatch changes 

this applies checkpatch-dictated fixes, with no functional change.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 4fd77487
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 65 deletions
proto-standard/arith.c
View file @ c114cae1
......@@ -12,7 +12,7 @@ void int64_to_TimeInternal(Integer64 bigint, TimeInternal *internal)
int64_t bigint_val;
bigint_val = bigint.lsb;
bigint_val+= ((int64_t)bigint.msb) << 32;
bigint_val += ((int64_t)bigint.msb) << 32;
internal->nanoseconds = bigint_val % PP_NSEC_PER_SEC;
internal->seconds = bigint_val / PP_NSEC_PER_SEC;
......@@ -24,7 +24,7 @@ void from_TimeInternal(TimeInternal *internal, Timestamp *external)
* fromInternalTime is only used to convert time given by the system
* to a timestamp As a consequence, no negative value can normally
* be found in (internal)
*
*
* Note that offsets are also represented with TimeInternal structure,
* and can be negative, but offset are never convert into Timestamp
* so there is no problem here.
......@@ -60,15 +60,15 @@ void to_TimeInternal(TimeInternal *internal, Timestamp *external)
void normalize_TimeInternal(TimeInternal *r)
{
r->seconds+= r->nanoseconds / PP_NSEC_PER_SEC;
r->nanoseconds-= r->nanoseconds / PP_NSEC_PER_SEC * PP_NSEC_PER_SEC;
r->seconds += r->nanoseconds / PP_NSEC_PER_SEC;
r->nanoseconds -= r->nanoseconds / PP_NSEC_PER_SEC * PP_NSEC_PER_SEC;
if (r->seconds > 0 && r->nanoseconds < 0) {
r->seconds-= 1;
r->nanoseconds+= PP_NSEC_PER_SEC;
r->seconds -= 1;
r->nanoseconds += PP_NSEC_PER_SEC;
} else if (r->seconds < 0 && r->nanoseconds > 0) {
r->seconds+= 1;
r->nanoseconds-= PP_NSEC_PER_SEC;
r->seconds += 1;
r->nanoseconds -= PP_NSEC_PER_SEC;
}
}
......
proto-standard/bmc.c
View file @ c114cae1
......@@ -15,7 +15,7 @@ void m1(struct pp_instance *ppi)
/* Parent data set */
pp_memcpy(DSPAR(ppi)->parentPortIdentity.clockIdentity,
DSDEF(ppi)->clockIdentity,PP_CLOCK_IDENTITY_LENGTH);
DSDEF(ppi)->clockIdentity, PP_CLOCK_IDENTITY_LENGTH);
DSPAR(ppi)->parentPortIdentity.portNumber = 0;
DSPAR(ppi)->parentStats = PP_DEFAULT_PARENTS_STATS;
DSPAR(ppi)->observedParentClockPhaseChangeRate = 0;
......@@ -63,7 +63,7 @@ void s1(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
/* Timeproperties DS */
DSPRO(ppi)->currentUtcOffset = ann->currentUtcOffset;
/* "Valid" is bit 2 in second octet of flagfield */
/* "Valid" is bit 2 in second octet of flagfield */
DSPRO(ppi)->currentUtcOffsetValid = ((hdr->flagField[1] & 0x04) ==
0x04);
......@@ -101,7 +101,7 @@ void copy_d0(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
* return similar to memcmp()
*/
Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
MsgHeader *hdr_b,MsgAnnounce *ann_b,
MsgHeader *hdr_b, MsgAnnounce *ann_b,
struct pp_instance *ppi)
{
/* FIXME DBGV("Data set comparison \n"); */
......@@ -110,7 +110,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
/* Identity comparison */
if (!pp_memcmp(ann_a->grandmasterIdentity,
ann_b->grandmasterIdentity,PP_CLOCK_IDENTITY_LENGTH)) {
ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH)) {
/* Algorithm part2 Fig 28 */
if (ann_a->stepsRemoved > ann_b->stepsRemoved + 1)
......@@ -147,8 +147,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
} else {
return -1;
}
}
else { /* steps removed A == steps removed B */
} else { /* steps removed A == steps removed B */
if (!pp_memcmp(
hdr_a->sourcePortIdentity.clockIdentity,
hdr_b->sourcePortIdentity.clockIdentity,
......@@ -168,13 +167,13 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
}
} else { /* GrandMaster are not identical */
/* FIXME: rewrite in a more readable way */
if(ann_a->grandmasterPriority1 == ann_b->grandmasterPriority1) {
if (ann_a->grandmasterPriority1 == ann_b->grandmasterPriority1) {
if (ann_a->grandmasterClockQuality.clockClass ==
ann_b->grandmasterClockQuality.clockClass) {
if (ann_a->grandmasterClockQuality.clockAccuracy == ann_b->grandmasterClockQuality.clockAccuracy) {
if (ann_a->grandmasterClockQuality.offsetScaledLogVariance == ann_b->grandmasterClockQuality.offsetScaledLogVariance) {
if (ann_a->grandmasterPriority2 == ann_b->grandmasterPriority2) {
comp = pp_memcmp(ann_a->grandmasterIdentity,ann_b->grandmasterIdentity,PP_CLOCK_IDENTITY_LENGTH);
comp = pp_memcmp(ann_a->grandmasterIdentity, ann_b->grandmasterIdentity, PP_CLOCK_IDENTITY_LENGTH);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -183,7 +182,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
return 0;
} else {
/* Priority2 are not identical */
comp =pp_memcmp(&ann_a->grandmasterPriority2,&ann_b->grandmasterPriority2,1);
comp = pp_memcmp(&ann_a->grandmasterPriority2, &ann_b->grandmasterPriority2, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -193,7 +192,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
}
} else {
/* offsetScaledLogVariance are not identical */
comp= pp_memcmp(&ann_a->grandmasterClockQuality.clockClass,&ann_b->grandmasterClockQuality.clockClass,1);
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -203,7 +202,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
}
} else { /* Accuracy are not identitcal */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockAccuracy,&ann_b->grandmasterClockQuality.clockAccuracy,1);
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockAccuracy, &ann_b->grandmasterClockQuality.clockAccuracy, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -212,7 +211,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
return 0;
}
} else { /* ClockClass are not identical */
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass,&ann_b->grandmasterClockQuality.clockClass,1);
comp = pp_memcmp(&ann_a->grandmasterClockQuality.clockClass, &ann_b->grandmasterClockQuality.clockClass, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -221,7 +220,7 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
return 0;
}
} else { /* Priority1 are not identical */
comp = pp_memcmp(&ann_a->grandmasterPriority1,&ann_b->grandmasterPriority1,1);
comp = pp_memcmp(&ann_a->grandmasterPriority1, &ann_b->grandmasterPriority1, 1);
if (comp < 0)
return -1;
else if (comp > 0)
......@@ -251,7 +250,7 @@ UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
cmpres = bmc_dataset_cmp(&ppi->msg_tmp_header,
&ppi->msg_tmp.announce,
hdr,ann,ppi);
hdr, ann, ppi);
if (DSDEF(ppi)->clockQuality.clockClass < 128) {
......@@ -271,7 +270,7 @@ UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
m1(ppi);
return PPS_MASTER;
} else if (cmpres > 0) {
s1(hdr,ann,ppi);
s1(hdr, ann, ppi);
return PPS_SLAVE;
} else {
/* FIXME DBG("Error in bmcDataSetComparison..\n"); */
......@@ -297,7 +296,7 @@ UInteger8 bmc(struct pp_frgn_master *frgn_master,
return ppi->state;
}
for (i=1, best = 0; i < ppi->number_foreign_records; i++)
for (i = 1, best = 0; i < ppi->number_foreign_records; i++)
if ((bmc_dataset_cmp(&frgn_master[i].hdr,
&frgn_master[i].ann,
&frgn_master[best].hdr,
......@@ -308,7 +307,7 @@ UInteger8 bmc(struct pp_frgn_master *frgn_master,
/* FIXME DBGV("Best record : %d \n",best); */
ppi->foreign_record_best = best;
return (bmc_state_decision(&frgn_master[best].hdr,
return bmc_state_decision(&frgn_master[best].hdr,
&frgn_master[best].ann,
rt_opts,ppi));
rt_opts, ppi);
}
proto-standard/common-fun.c
View file @ c114cae1
......@@ -16,8 +16,7 @@ void st_com_execute_slave(struct pp_instance *ppi)
DSDEF(ppi)->clockQuality.clockClass != 255) {
m1(ppi);
ppi->next_state = PPS_MASTER;
}
else {
} else {
ppi->next_state = PPS_LISTENING;
st_com_restart_annrec_timer(ppi);
}
......@@ -54,7 +53,7 @@ void st_com_restart_annrec_timer(struct pp_instance *ppi)
int st_com_check_record_update(struct pp_instance *ppi)
{
if(ppi->record_update) {
if (ppi->record_update) {
/* FIXME diag DBGV("event STATE_DECISION_EVENT\n"); */
ppi->record_update = FALSE;
ppi->next_state = bmc(ppi->frgn_master,
......@@ -151,8 +150,7 @@ int st_com_slave_handle_announce(unsigned char *buf, int len,
if (!ppi->is_from_cur_par) {
msg_unpack_announce(buf, &ppi->msg_tmp.announce);
s1(hdr, &ppi->msg_tmp.announce, ppi);
}
else {
} else {
/* st_com_add_foreign takes care of announce unpacking */
st_com_add_foreign(buf, ppi);
}
......@@ -173,9 +171,8 @@ int st_com_slave_handle_sync(unsigned char *buf, int len, TimeInternal *time,
if (len < PP_SYNC_LENGTH)
return -1;
if (ppi->is_from_self) {
if (ppi->is_from_self)
return 0;
}
if (ppi->is_from_cur_par) {
ppi->sync_receive_time.seconds = time->seconds;
......@@ -213,7 +210,7 @@ int st_com_slave_handle_sync(unsigned char *buf, int len, TimeInternal *time,
&ppi->msg_tmp.sync.originTimestamp);
pp_update_offset(&origin_tstamp,
&ppi->sync_receive_time,
&correction_field,ppi);
&correction_field, ppi);
pp_update_clock(ppi);
}
}
......@@ -262,7 +259,7 @@ int st_com_slave_handle_followup(unsigned char *buf, int len,
int64_to_TimeInternal(ppi->msg_tmp_header.correctionfield,
&correction_field);
add_TimeInternal(&correction_field,&correction_field,
add_TimeInternal(&correction_field, &correction_field,
&ppi->last_sync_corr_field);
pp_update_offset(&precise_orig_timestamp,
......@@ -298,7 +295,7 @@ int st_com_handle_pdelay_req(unsigned char *buf, int len,
&ppi->pdelay_req_send_time,
&ppi->rt_opts->outbound_latency);
} else {
msg_copy_header(&ppi->pdelay_req_hdr,hdr);
msg_copy_header(&ppi->pdelay_req_hdr, hdr);
/* TODO issuePDelayResp(time, header, rtOpts,
ptpClock);
......@@ -341,7 +338,7 @@ int st_com_master_handle_sync(unsigned char *buf, int len, TimeInternal *time,
return 0;
/* Add latency */
add_TimeInternal(time,time,&ppi->rt_opts->outbound_latency);
add_TimeInternal(time, time, &ppi->rt_opts->outbound_latency);
/* TODO issueFollowup(time,rtOpts,ptpClock);*/
return 0;
}
proto-standard/msg.c
View file @ c114cae1
......@@ -80,7 +80,7 @@ void msg_pack_header(void *buf, struct pp_instance *ppi)
void *msg_copy_header(MsgHeader *dest, MsgHeader *src)
{
return pp_memcpy(dest,src,sizeof(MsgHeader));
return pp_memcpy(dest, src, sizeof(MsgHeader));
}
......@@ -110,11 +110,11 @@ void msg_pack_sync(void *buf, Timestamp *orig_tstamp, struct pp_instance *ppi)
/* Unpack Sync message from in buffer */
void msg_unpack_sync(void *buf, MsgSync *sync)
{
sync->originTimestamp.secondsField.msb =
sync->originTimestamp.secondsField.msb =
htons(*(UInteger16 *) (buf + 34));
sync->originTimestamp.secondsField.lsb =
sync->originTimestamp.secondsField.lsb =
htonl(*(UInteger32 *) (buf + 36));
sync->originTimestamp.nanosecondsField =
sync->originTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
/* FIXME: diag
......@@ -144,7 +144,7 @@ void msg_pack_announce(void *buf, struct pp_instance *ppi)
*(UInteger8 *) (buf + 47) = DSPAR(ppi)->grandmasterPriority1;
*(UInteger8 *) (buf + 48) = DSDEF(ppi)->clockQuality.clockClass;
*(Enumeration8 *) (buf + 49) = DSDEF(ppi)->clockQuality.clockAccuracy;
*(UInteger16 *) (buf + 50) =
*(UInteger16 *) (buf + 50) =
htons(DSDEF(ppi)->clockQuality.offsetScaledLogVariance);
*(UInteger8 *) (buf + 52) = DSPAR(ppi)->grandmasterPriority2;
pp_memcpy((buf + 53), DSPAR(ppi)->grandmasterIdentity,
......@@ -204,11 +204,11 @@ void msg_pack_follow_up(void *buf, Timestamp *prec_orig_tstamp,
*(Integer8 *) (buf + 33) = DSPOR(ppi)->logSyncInterval;
/* Follow Up message */
*(UInteger16 *) (buf + 34) =
*(UInteger16 *) (buf + 34) =
htons(prec_orig_tstamp->secondsField.msb);
*(UInteger32 *) (buf + 36) =
*(UInteger32 *) (buf + 36) =
htonl(prec_orig_tstamp->secondsField.lsb);
*(UInteger32 *) (buf + 40) =
*(UInteger32 *) (buf + 40) =
htonl(prec_orig_tstamp->nanosecondsField);
}
......@@ -306,7 +306,7 @@ void msg_pack_delay_resp(void *buf, MsgHeader *hdr, Timestamp *rcv_tstamp,
*(Integer32 *) (buf + 12) = htonl(hdr->correctionfield.lsb);
*(UInteger16 *) (buf + 30) = htons(hdr->sequenceId);
*(UInteger8 *) (buf + 32) = 0x03;
/* Table 23 */
......@@ -315,13 +315,13 @@ void msg_pack_delay_resp(void *buf, MsgHeader *hdr, Timestamp *rcv_tstamp,
/* Table 24 */
/* Pdelay_resp message */
*(UInteger16 *) (buf + 34) =
*(UInteger16 *) (buf + 34) =
htons(rcv_tstamp->secondsField.msb);
*(UInteger32 *) (buf + 36) = htonl(rcv_tstamp->secondsField.lsb);
*(UInteger32 *) (buf + 40) = htonl(rcv_tstamp->nanosecondsField);
pp_memcpy((buf + 44), hdr->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH);
*(UInteger16 *) (buf + 52) =
*(UInteger16 *) (buf + 52) =
htons(hdr->sourcePortIdentity.portNumber);
}
......@@ -396,15 +396,15 @@ void msg_unpack_pdelay_req(void *buf, MsgPDelayReq *pdelay_req)
/* Unpack delayResp message from IN buffer of ppi to msgtmp.presp */
void msg_unpack_delay_resp(void *buf, MsgDelayResp *resp)
{
resp->receiveTimestamp.secondsField.msb =
resp->receiveTimestamp.secondsField.msb =
htons(*(UInteger16 *) (buf + 34));
resp->receiveTimestamp.secondsField.lsb =
resp->receiveTimestamp.secondsField.lsb =
htonl(*(UInteger32 *) (buf + 36));
resp->receiveTimestamp.nanosecondsField =
resp->receiveTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
pp_memcpy(resp->requestingPortIdentity.clockIdentity,
pp_memcpy(resp->requestingPortIdentity.clockIdentity,
(buf + 44), PP_CLOCK_IDENTITY_LENGTH);
resp->requestingPortIdentity.portNumber =
resp->requestingPortIdentity.portNumber =
htons(*(UInteger16 *) (buf + 52));
/* FIXME: diag
......@@ -437,7 +437,7 @@ void msg_unpack_pdelay_resp(void *buf, MsgPDelayResp *presp)
/* Pack PdelayRespFollowUp message into out buffer of ppi */
void msg_pack_pdelay_resp_followup(void *buf, MsgHeader *hdr,
Timestamp *resp_orig_tstamp, struct pp_instance* ppi)
Timestamp *resp_orig_tstamp, struct pp_instance *ppi)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......
proto-standard/open-close.c
View file @ c114cae1
......@@ -56,12 +56,11 @@ int pp_parse_cmdline(struct pp_instance *ppi, int argc, char **argv)
int pp_open_instance(struct pp_instance *ppi, struct pp_runtime_opts *rt_opts)
{
if (rt_opts) {
if (rt_opts)
ppi->rt_opts = rt_opts;
}
else {
else
ppi->rt_opts = &default_rt_opts;
}
ppi->state = PPS_INITIALIZING;
return 0;
......
proto-standard/state-initializing.c
View file @ c114cae1
......@@ -13,7 +13,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
struct pp_runtime_opts *rt_opts = ppi->rt_opts;
pp_net_shutdown(ppi);
if (pp_net_init(ppi) < 0)
goto failure;
......@@ -54,7 +54,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
m1(ppi);
msg_pack_header(ppi->buf_out,ppi);
msg_pack_header(ppi->buf_out, ppi);
ppi->next_state = PPS_LISTENING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
......
proto-standard/state-master.c
View file @ c114cae1
......@@ -124,8 +124,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
ppi->last_pdelay_resp_corr_field.nanoseconds =
correction_field.nanoseconds;
break;
}
else {
} else {
/* One step Clock */
/* Store t4 (Fig 35)*/
ppi->pdelay_resp_receive_time.seconds =
......@@ -185,10 +184,9 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (DSDEF(ppi)->slaveOnly ||
DSDEF(ppi)->clockQuality.clockClass == 255)
ppi->next_state = PPS_LISTENING;
}
else
} else {
ppi->next_state = PPS_FAULTY;
}
state_updated:
/* Leaving this state */
......
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