Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • project/ppsi
1 result
Show changes
Commits on Source (1)
Hide whitespace changes
Inline Side-by-side
proto-ext-whiterabbit/hooks.c
View file @ 9bdd4913
......@@ -212,7 +212,7 @@ static int wr_bmca_s1( struct pp_instance * ppi,
}
// Update WR parent flags
wrp->parentIsWRnode = (wr_flags & WR_NODE_MODE)==NON_WR;
wrp->parentIsWRnode = (wr_flags & WR_NODE_MODE)!=NON_WR;
wrp->parentWrModeOn = (wr_flags & WR_IS_WR_MODE) != 0;
wrp->parentCalibrated =(wr_flags & WR_IS_CALIBRATED) != 0;
wrp->parentWrConfig = wr_flags & WR_NODE_MODE;
......@@ -233,7 +233,9 @@ static void wr_state_change(struct pp_instance *ppi)
pp_diag(ppi, ext, 2, "hook: %s\n", __func__);
if (ppi->state == PPS_SLAVE && ppi->next_state==PPS_UNCALIBRATED) {
if (ppi->state == PPS_SLAVE &&
ppi->next_state==PPS_UNCALIBRATED &&
wrp->parentIsWRnode) {
pdstate_enable_extension(ppi); // Re-enable the extension
}
......
proto-ext-whiterabbit/state-wr-idle.c
View file @ 9bdd4913
......@@ -53,7 +53,7 @@ int wr_idle(struct pp_instance *ppi, void *buf, int len, int new_state)
} else {
wrp->parentDetection=PD_NO_DETECTION;
}
return 0;
delay=0;
}
else if ( wrp->parentDetection==PD_NOT_WR_PARENT ) {
if ( ppi->extState==PP_EXSTATE_ACTIVE ) {
......