Skip to content

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

whiterabbit: remove unused assignments to wrPortState 

The wrPortState variable was assigned-to in various places: it was
"almost" mirroring the PTP state, but not every WR state was actually
setting it.  In fact, it was only used for calibration sub-states, so
remove all other assignment.

Often, the code did:

   wp->wrMode = NON_WR;
   wp->wrPortState = WR_PORT_IDLE;

but only wrMode was ever checked, so WR_PORT_IDLE (was: WRS_IDLE) is
redundant and can be removed altogether.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent b716034f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 19 deletions
proto-ext-whiterabbit/hooks.c
View file @ da92cc2a
...@@ -67,7 +67,6 @@ static int wr_listening(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -67,7 +67,6 @@ static int wr_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
struct wr_dsport *wp = WR_DSPOR(ppi); struct wr_dsport *wp = WR_DSPOR(ppi);
wp->wrMode = NON_WR; wp->wrMode = NON_WR;
wp->wrPortState = WR_PORT_IDLE;
return 0; return 0;
} }
......
proto-ext-whiterabbit/state-wr-calibrated.c
View file @ da92cc2a
...@@ -14,7 +14,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -14,7 +14,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
MsgSignaling wrsig_msg; MsgSignaling wrsig_msg;
if (ppi->is_new_state) { if (ppi->is_new_state) {
WR_DSPOR(ppi)->wrPortState = WRS_CALIBRATED;
pp_timeout_set(ppi, PP_TO_EXT_0, pp_timeout_set(ppi, PP_TO_EXT_0,
WR_DSPOR(ppi)->wrStateTimeout); WR_DSPOR(ppi)->wrStateTimeout);
} }
...@@ -24,7 +23,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -24,7 +23,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
ppi->next_state = PPS_MASTER; ppi->next_state = PPS_MASTER;
else else
ppi->next_state = PPS_LISTENING; ppi->next_state = PPS_LISTENING;
WR_DSPOR(ppi)->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-calibration.c
View file @ da92cc2a
...@@ -30,7 +30,6 @@ int wr_calibration(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -30,7 +30,6 @@ int wr_calibration(struct pp_instance *ppi, unsigned char *pkt, int plen)
ppi->next_state = PPS_MASTER; ppi->next_state = PPS_MASTER;
else else
ppi->next_state = PPS_LISTENING; ppi->next_state = PPS_LISTENING;
wrp->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-link-on.c
View file @ da92cc2a
...@@ -22,14 +22,11 @@ int wr_link_on(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -22,14 +22,11 @@ int wr_link_on(struct pp_instance *ppi, unsigned char *pkt, int plen)
e = msg_issue_wrsig(ppi, WR_MODE_ON); e = msg_issue_wrsig(ppi, WR_MODE_ON);
wrp->parentWrModeOn = TRUE; wrp->parentWrModeOn = TRUE;
wrp->wrPortState = WRS_WR_LINK_ON;
} }
if (e != 0) if (e != 0)
return -1; return -1;
wrp->wrPortState = WR_PORT_IDLE;
if (wrp->wrMode == WR_SLAVE) if (wrp->wrMode == WR_SLAVE)
ppi->next_state = PPS_SLAVE; ppi->next_state = PPS_SLAVE;
else else
......
proto-ext-whiterabbit/state-wr-locked.c
View file @ da92cc2a
...@@ -15,7 +15,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -15,7 +15,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen)
MsgSignaling wrsig_msg; MsgSignaling wrsig_msg;
if (ppi->is_new_state) { if (ppi->is_new_state) {
WR_DSPOR(ppi)->wrPortState = WRS_LOCKED;
pp_timeout_set(ppi, PP_TO_EXT_0, pp_timeout_set(ppi, PP_TO_EXT_0,
WR_DSPOR(ppi)->wrStateTimeout); WR_DSPOR(ppi)->wrStateTimeout);
...@@ -26,7 +25,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -26,7 +25,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_timeout_z(ppi, PP_TO_EXT_0)) { if (pp_timeout_z(ppi, PP_TO_EXT_0)) {
ppi->next_state = PPS_LISTENING; ppi->next_state = PPS_LISTENING;
WR_DSPOR(ppi)->wrMode = NON_WR; WR_DSPOR(ppi)->wrMode = NON_WR;
WR_DSPOR(ppi)->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-m-lock.c
View file @ da92cc2a
...@@ -15,7 +15,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -15,7 +15,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen)
MsgSignaling wrsig_msg; MsgSignaling wrsig_msg;
if (ppi->is_new_state) { if (ppi->is_new_state) {
WR_DSPOR(ppi)->wrPortState = WRS_M_LOCK;
WR_DSPOR(ppi)->wrMode = WR_MASTER; WR_DSPOR(ppi)->wrMode = WR_MASTER;
e = msg_issue_wrsig(ppi, LOCK); e = msg_issue_wrsig(ppi, LOCK);
pp_timeout_set(ppi, PP_TO_EXT_0, WR_M_LOCK_TIMEOUT_MS); pp_timeout_set(ppi, PP_TO_EXT_0, WR_M_LOCK_TIMEOUT_MS);
...@@ -23,7 +22,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -23,7 +22,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_timeout_z(ppi, PP_TO_EXT_0)) { if (pp_timeout_z(ppi, PP_TO_EXT_0)) {
ppi->next_state = PPS_MASTER; ppi->next_state = PPS_MASTER;
WR_DSPOR(ppi)->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-present.c
View file @ da92cc2a
...@@ -17,7 +17,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -17,7 +17,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
MsgSignaling wrsig_msg; MsgSignaling wrsig_msg;
if (ppi->is_new_state) { if (ppi->is_new_state) {
WR_DSPOR(ppi)->wrPortState = WRS_PRESENT;
WR_DSPOR(ppi)->wrMode = WR_SLAVE; WR_DSPOR(ppi)->wrMode = WR_SLAVE;
pp_timeout_set(ppi, PP_TO_EXT_0, pp_timeout_set(ppi, PP_TO_EXT_0,
WR_WRS_PRESENT_TIMEOUT_MS); WR_WRS_PRESENT_TIMEOUT_MS);
...@@ -28,7 +27,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -28,7 +27,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_timeout_z(ppi, PP_TO_EXT_0)) { if (pp_timeout_z(ppi, PP_TO_EXT_0)) {
ppi->next_state = PPS_LISTENING; ppi->next_state = PPS_LISTENING;
WR_DSPOR(ppi)->wrMode = NON_WR; WR_DSPOR(ppi)->wrMode = NON_WR;
WR_DSPOR(ppi)->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-resp-calib-req.c
View file @ da92cc2a
...@@ -16,7 +16,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -16,7 +16,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
MsgSignaling wrsig_msg; MsgSignaling wrsig_msg;
if (ppi->is_new_state) { if (ppi->is_new_state) {
wrp->wrPortState = WRS_RESP_CALIB_REQ;
if (wrp->otherNodeCalSendPattern) { if (wrp->otherNodeCalSendPattern) {
wrp->ops->calib_pattern_enable(ppi, 0, 0, 0); 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,
...@@ -31,7 +30,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -31,7 +30,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
ppi->next_state = PPS_MASTER; ppi->next_state = PPS_MASTER;
else else
ppi->next_state = PPS_LISTENING; ppi->next_state = PPS_LISTENING;
wrp->wrPortState = WR_PORT_IDLE;
goto out; goto out;
} }
......
proto-ext-whiterabbit/state-wr-s-lock.c
View file @ da92cc2a
...@@ -21,7 +21,6 @@ int wr_s_lock(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -21,7 +21,6 @@ int wr_s_lock(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_timeout_z(ppi, PP_TO_EXT_0)) { if (pp_timeout_z(ppi, PP_TO_EXT_0)) {
ppi->next_state = PPS_FAULTY; ppi->next_state = PPS_FAULTY;
wrp->wrPortState = WR_PORT_IDLE;
wrp->wrMode = NON_WR; wrp->wrMode = NON_WR;
goto out; goto out;
} }
......
proto-ext-whiterabbit/wr-api.h
View file @ da92cc2a
...@@ -22,7 +22,7 @@ struct wr_dsport { ...@@ -22,7 +22,7 @@ struct wr_dsport {
Enumeration8 wrMode; Enumeration8 wrMode;
Boolean wrModeOn; Boolean wrModeOn;
Boolean ppsOutputOn; Boolean ppsOutputOn;
Enumeration8 wrPortState; Enumeration8 wrPortState; /* used for sub-states during calibration */
/* FIXME check doc: knownDeltaTx, knownDeltaRx, deltasKnown?) */ /* FIXME check doc: knownDeltaTx, knownDeltaRx, deltasKnown?) */
Boolean calibrated; Boolean calibrated;
FixedDelta deltaTx; FixedDelta deltaTx;
......
proto-ext-whiterabbit/wr-constants.h
View file @ da92cc2a
...@@ -128,8 +128,7 @@ enum { ...@@ -128,8 +128,7 @@ enum {
WRS_CALIBRATED, WRS_CALIBRATED,
WRS_RESP_CALIB_REQ, WRS_RESP_CALIB_REQ,
WRS_WR_LINK_ON, WRS_WR_LINK_ON,
/* here are substates and informative wrPortState values */ /* substates: used within WRS_CALIBRATED as wrPortState field */
WR_PORT_IDLE,
WR_PORT_CALIBRATION_0, WR_PORT_CALIBRATION_0,
WR_PORT_CALIBRATION_1, WR_PORT_CALIBRATION_1,
WR_PORT_CALIBRATION_2, WR_PORT_CALIBRATION_2,
......
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