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

port: Match calling convention for tmv_to_Timestamp() 

The function ts_to_timestamp() currently performs open-coded
manipulation of a struct timespec and struct Timestamp instead of
using the tmv_t abstractions.

Prepare for the removal of this code by matching the calling
convention for tmv_to_Timestamp(): returning a struct Timestamp rather
than accepting a pointer to a struct Timestamp.

Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
master
Michael Brown 2018-03-12 12:36:29 +00:00 committed by Richard Cochran
parent cdceec59fa
commit 5a23ccddf6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
port.c
View File

@ -393,11 +393,13 @@ static void ts_add(struct timespec *ts, Integer64 correction)
} }
} }
static void ts_to_timestamp(struct timespec *src, struct Timestamp *dst) static struct Timestamp ts_to_Timestamp(struct timespec src)
{ {
dst->seconds_lsb = src->tv_sec; struct Timestamp dst;
dst->seconds_msb = 0; dst.seconds_lsb = src.tv_sec;
dst->nanoseconds = src->tv_nsec; dst.seconds_msb = 0;
dst.nanoseconds = src.tv_nsec;
return dst;
} }
/* /*
@ -1506,7 +1508,7 @@ static int port_tx_sync(struct port *p, struct address *dst)
fup->header.control = CTL_FOLLOW_UP; fup->header.control = CTL_FOLLOW_UP;
fup->header.logMessageInterval = p->logSyncInterval; fup->header.logMessageInterval = p->logSyncInterval;
ts_to_timestamp(&msg->hwts.ts, &fup->follow_up.preciseOriginTimestamp); fup->follow_up.preciseOriginTimestamp = ts_to_Timestamp(msg->hwts.ts);
if (dst) { if (dst) {
fup->address = *dst; fup->address = *dst;
@ -1800,7 +1802,7 @@ static int process_delay_req(struct port *p, struct ptp_message *m)
msg->header.control = CTL_DELAY_RESP; msg->header.control = CTL_DELAY_RESP;
msg->header.logMessageInterval = p->logMinDelayReqInterval; msg->header.logMessageInterval = p->logMinDelayReqInterval;
ts_to_timestamp(&m->hwts.ts, &msg->delay_resp.receiveTimestamp); msg->delay_resp.receiveTimestamp = ts_to_Timestamp(m->hwts.ts);
msg->delay_resp.requestingPortIdentity = m->header.sourcePortIdentity; msg->delay_resp.requestingPortIdentity = m->header.sourcePortIdentity;
@ -1975,7 +1977,7 @@ static int process_pdelay_req(struct port *p, struct ptp_message *m)
* NB - We do not have any fraction nanoseconds for the correction * NB - We do not have any fraction nanoseconds for the correction
* fields, neither in the response or the follow up. * fields, neither in the response or the follow up.
*/ */
ts_to_timestamp(&m->hwts.ts, &rsp->pdelay_resp.requestReceiptTimestamp); rsp->pdelay_resp.requestReceiptTimestamp = ts_to_Timestamp(m->hwts.ts);
rsp->pdelay_resp.requestingPortIdentity = m->header.sourcePortIdentity; rsp->pdelay_resp.requestingPortIdentity = m->header.sourcePortIdentity;
fup->hwts.type = p->timestamping; fup->hwts.type = p->timestamping;
@ -2002,8 +2004,8 @@ static int process_pdelay_req(struct port *p, struct ptp_message *m)
goto out; goto out;
} }
ts_to_timestamp(&rsp->hwts.ts, fup->pdelay_resp_fup.responseOriginTimestamp =
&fup->pdelay_resp_fup.responseOriginTimestamp); ts_to_Timestamp(rsp->hwts.ts);
err = peer_prepare_and_send(p, fup, 0); err = peer_prepare_and_send(p, fup, 0);
if (err) if (err)