trivial: wr-constants: fix states enumeration

Also, remove unused management macros and a wrong "+ 4" in announce length. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

trivial: wr-constants: fix states enumeration
Also, remove unused management macros and a wrong "+ 4" in announce length. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
9bd032a6 · Alessandro Rubini · e4648dba · 9bd032a6
Commit 9bd032a6 authored Mar 02, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 10 deletions

wr-constants.h proto-ext-whiterabbit/wr-constants.h +13 -10

No files found.
--- a/proto-ext-whiterabbit/wr-constants.h
+++ b/proto-ext-whiterabbit/wr-constants.h
@@ -32,9 +32,7 @@
 /* White Rabbit package Size */
 #define WR_ANNOUNCE_TLV_LENGTH		0x0A
-#define WR_ANNOUNCE_LENGTH    (PP_ANNOUNCE_LENGTH + WR_ANNOUNCE_TLV_LENGTH + 4)
+#define WR_ANNOUNCE_LENGTH    (PP_ANNOUNCE_LENGTH + WR_ANNOUNCE_TLV_LENGTH)
-#define WR_MANAGEMENT_TLV_LENGTH	 6
-#define WR_MANAGEMENT_LENGTH  (MANAGEMENT_LENGTH + WR_MANAGEMENT_TLV_LENGTH)
 /* memory footprint tweak for WRPC */
 #ifdef WRPC_EXTRA_SLIM
@@ -114,13 +112,18 @@ enum {
 /* brief WR PTP states (new, single FSM) */
 enum {
-	/* WR states start from 16 in order not to be confused with PTP states,
+	/*
-	 * since our application FSM is flat */
+	 * Extension-specific states start from 100 according to some docs
-	WRS_PRESENT = 16, WRS_S_LOCK, WRS_M_LOCK,  WRS_LOCKED,
+	 * so not to conflict with normal states
-	WRS_CALIBRATION, WRS_CALIBRATED, WRS_RESP_CALIB_REQ, WRS_WR_LINK_ON,
+	 */
-	/* Each WR main state (except IDLE) has an associated timeout
+	WRS_PRESENT = 100,
-	 * we use state names to manage timeouts as well */
+	WRS_S_LOCK,
-	WR_TIMER_ARRAY_SIZE, /* number of states which has timeouts */
+	WRS_M_LOCK,
+	WRS_LOCKED,
+	WRS_CALIBRATION,
+	WRS_CALIBRATED,
+	WRS_RESP_CALIB_REQ,
+	WRS_WR_LINK_ON,
 	WRS_IDLE,
 	/* here are substates*/
 	WRS_S_LOCK_1,