Skip to content

P
PPSi
Commit 5d3414a2 authored by Maciej Lipinski's avatar Maciej Lipinski Committed by [ACC] Jean-Claude BAU
Browse files
Options

aded retry to calibrated state

parent b18cfc8b
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 7 deletions
proto-ext-whiterabbit/state-wr-calibrated.c
View file @ 5d3414a2
......@@ -16,20 +16,29 @@ int wr_calibrated(struct pp_instance *ppi, void *buf, int len)
{
struct wr_dsport *wrp = WR_DSPOR(ppi);
MsgSignaling wrsig_msg;
int e = 0, enable = 0;
if (ppi->is_new_state)
__pp_timeout_set(ppi, PP_TO_EXT_0, wrp->wrStateTimeout);
if (pp_timeout(ppi, PP_TO_EXT_0)) {
if (ppi->is_new_state) {
wrp->wrStateRetry = WR_STATE_RETRY;
enable = 1;
} else if (pp_timeout(ppi, PP_TO_EXT_0)) {
/*
* FIXME: We should implement a retry by re-sending
* the "calibrated" message, moving it here from the
* previous state (sub-state 8 of "state-wr-calibration"
*/
wr_handshake_fail(ppi);
return 0; /* non-wr */
if (wr_handshake_retry(ppi))
enable = 1;
else
return 0; /* non-wr already */
}
if (enable)
{
__pp_timeout_set(ppi, PP_TO_EXT_0, wrp->wrStateTimeout);
e = msg_issue_wrsig(ppi, CALIBRATED);
}
if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
msg_unpack_wrsig(ppi, buf, &wrsig_msg,
&(wrp->msgTmpWrMessageID));
......
proto-ext-whiterabbit/state-wr-calibration.c
View file @ 5d3414a2
......@@ -125,7 +125,8 @@ int wr_calibration(struct pp_instance *ppi, void *buf, int len)
break;
case WR_PORT_CALIBRATION_8:
/* send deltas to the other port and go to the next state */
msg_issue_wrsig(ppi, CALIBRATED);
// msg_issue_wrsig(ppi, CALIBRATED);
ppi->next_state = WRS_CALIBRATED;
wrp->calibrated = TRUE;
......
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