Skip to content

P
PPSi
Commit 03d47e6b authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

whiterabbit: fix timeout bug in resp-calib-req 

This bug was present in previous versions too: when not sending the
calibration pattern, we had no timeout, so a lost frame was fatal.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 5702115b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
proto-ext-whiterabbit/state-wr-resp-calib-req.c
View file @ 03d47e6b
......@@ -20,7 +20,8 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
wrp->wrStateRetry = WR_STATE_RETRY;
enable = 1;
} else if (pp_timeout_z(ppi, PP_TO_EXT_0)) {
wrp->ops->calib_pattern_disable(ppi);
if (send_pattern)
wrp->ops->calib_pattern_disable(ppi);
if (wr_handshake_retry(ppi))
enable = 1;
else
......@@ -28,12 +29,10 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
}
if (enable) { /* first or retry */
if (send_pattern) {
if (send_pattern)
wrp->ops->calib_pattern_enable(ppi, 0, 0, 0);
pp_timeout_set(ppi, PP_TO_EXT_0,
pp_timeout_set(ppi, PP_TO_EXT_0,
wrp->otherNodeCalPeriod / 1000);
}
}
if (plen == 0)
......
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