Skip to content

P
PPSi
Commit 40bfbef7 authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

WIP: test for spll lock problem 

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent 49833dde
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
proto-ext-whiterabbit/common-fun.c
View file @ 40bfbef7
......@@ -29,7 +29,7 @@ void wr_handshake_fail(struct pp_instance *ppi)
{
struct wr_dsport *wrp = WR_DSPOR(ppi);
pp_diag(ppi, ext, 1, "Handshake failure: now non-wr %s\n",
pp_diag(ppi, ext, 0, "Handshake failure: now non-wr %s\n",
wrp->wrMode == WR_MASTER ? "master" : "slave");
wrp->next_state=WRS_IDLE;
wr_reset_process(ppi,WR_ROLE_NONE);
......@@ -45,7 +45,7 @@ int wr_handshake_retry(struct pp_instance *ppi)
if (wrp->wrStateRetry > 0) {
wrp->wrStateRetry--;
pp_diag(ppi, ext, 1, "Retry on timeout\n");
pp_diag(ppi, ext, 0, "Retry on timeout\n");
return 1; /* yes, retry */
}
return 0; /* don't retry, we are over already */
......
proto-ext-whiterabbit/state-wr-locked.c
View file @ 40bfbef7
......@@ -34,7 +34,7 @@ int wr_locked(struct pp_instance *ppi, void *buf, int len, int new_state)
if ( wrMsgId == CALIBRATE ) {
wrp->next_state= WRS_RESP_CALIB_REQ;
} else {
pp_diag(ppi, ext, 1, "WR: Invalid msgId(x%04x) received. %s was expected\n",wrMsgId, "CALIBRATE");
pp_diag(ppi, ext, 0, "WR: Invalid msgId(x%04x) received. %s was expected\n",wrMsgId, "CALIBRATE");
}
return 0;
}
......@@ -44,7 +44,7 @@ int wr_locked(struct pp_instance *ppi, void *buf, int len, int new_state)
int rms=pp_next_delay_1(ppi, PP_TO_WR_EXT_0);
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if ( !rms ) {
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
pp_diag(ppi, time, 0, "%s: timeout expired: %s\n", __func__, WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
proto-ext-whiterabbit/state-wr-s-lock.c
View file @ 40bfbef7
......@@ -33,7 +33,7 @@ int wr_s_lock(struct pp_instance *ppi, void *buf, int len, int new_state)
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
WRH_OPER()->locking_disable(ppi);
if ( rms==0 ) {
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
pp_diag(ppi, time, 0, "%s timeout expired: %s\n", __func__, WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
proto-ext-whiterabbit/wr-constants.h
View file @ 40bfbef7
......@@ -34,9 +34,9 @@
/* Special case for eRTM14 and wr2rf.
* Where it can take more than 15sec to sync PLL */
#if CONFIG_TARGET_ERTM14 || CONFIG_TARGET_WR2RF_VME
#define WR_S_LOCK_TIMEOUT_MS 30000
#define WR_S_LOCK_TIMEOUT_MS 60000
#else
#define WR_S_LOCK_TIMEOUT_MS 15000
#define WR_S_LOCK_TIMEOUT_MS 60000
#endif
......
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