[WR Timers] Back to original WR timers, now specified separately.

the names correspond to the info provide to Veryx for testing

[WR Timers] Back to original WR timers, now specified separately.
the names correspond to the info provide to Veryx for testing
f78973dc · Maciej Lipinski · 89b2b274 · f78973dc · f78973dc · f78973dc
Commit f78973dc authored Dec 06, 2018 by Maciej Lipinski
5 changed files
--- a/proto-ext-whiterabbit/state-wr-calibrated.c
+++ b/proto-ext-whiterabbit/state-wr-calibrated.c
@@ -36,7 +36,7 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)

 	if (enable)
        {
-		__pp_timeout_set(ppi, PP_TO_EXT_0, wrp->wrStateTimeout);
+		__pp_timeout_set(ppi, PP_TO_EXT_0, WR_CALIBRATED_TIMEOUT_MS);
 		e = msg_issue_wrsig(ppi, CALIBRATED);
        }


--- a/proto-ext-whiterabbit/state-wr-locked.c
+++ b/proto-ext-whiterabbit/state-wr-locked.c
@@ -30,7 +30,7 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	}

 	if (sendmsg) {
-		__pp_timeout_set(ppi, PP_TO_EXT_0, wrp->wrStateTimeout);
+		__pp_timeout_set(ppi, PP_TO_EXT_0, WR_LOCKED_TIMEOUT_MS);
 		e = msg_issue_wrsig(ppi, LOCKED);
 	}


--- a/proto-ext-whiterabbit/state-wr-present.c
+++ b/proto-ext-whiterabbit/state-wr-present.c
@@ -34,7 +34,7 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	}

 	if (sendmsg) {
-		__pp_timeout_set(ppi, PP_TO_EXT_0, WR_WRS_PRESENT_TIMEOUT_MS);
+		__pp_timeout_set(ppi, PP_TO_EXT_0, WR_PRESENT_TIMEOUT_MS);
 		e = msg_issue_wrsig(ppi, SLAVE_PRESENT);
 	}


--- a/proto-ext-whiterabbit/state-wr-resp-calib-req.c
+++ b/proto-ext-whiterabbit/state-wr-resp-calib-req.c
@@ -32,7 +32,7 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		if (send_pattern)
 			wrp->ops->calib_pattern_enable(ppi, 0, 0, 0);
 		__pp_timeout_set(ppi, PP_TO_EXT_0,
-			       wrp->wrStateTimeout / 1000);
+			       WR_RESP_CALIB_REQ_TIMEOUT_MS);
 	}

 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {

--- a/proto-ext-whiterabbit/wr-constants.h
+++ b/proto-ext-whiterabbit/wr-constants.h
@@ -19,12 +19,18 @@

 # define WR_TLV_TYPE			0x2004

-#define WR_DEFAULT_CAL_PERIOD		3000	/* [us] */
+#define WR_DEFAULT_STATE_TIMEOUT_MS	300	/* [ms] ML: not really used*/
+
+#define WR_PRESENT_TIMEOUT_MS	        1000
+#define WR_M_LOCK_TIMEOUT_MS		1500
+#define WR_S_LOCK_TIMEOUT_MS		1500
+#define WR_LOCKED_TIMEOUT_MS             300
+#define WR_CALIBRATION_TIMEOUT_MS       3000
+#define WR_RESP_CALIB_REQ_TIMEOUT_MS       3
+#define WR_CALIBRATED_TIMEOUT_MS         300
+
+#define WR_DEFAULT_CAL_PERIOD		WR_CALIBRATION_TIMEOUT_MS	/* [us] */

-#define WR_DEFAULT_STATE_TIMEOUT_MS	300	/* [ms] */
-#define WR_WRS_PRESENT_TIMEOUT_MS	300
-#define WR_M_LOCK_TIMEOUT_MS		300
-#define WR_S_LOCK_TIMEOUT_MS		300
 #define WR_STATE_RETRY			3	/* if WR handhsake fails */

 /* White Rabbit package Size */