HSR: adding 1 level to the Ring

We need to know whether a WRS is conected to a master outside the ring to start the backup<->backup synchronization

HSR: adding 1 level to the Ring
We need to know whether a WRS is conected to a master outside the ring to start the backup<->backup synchronization
c347941c · José Luis Gutiérrez · 6a5e05c2 · c347941c · c347941c · c347941c
Commit c347941c authored Nov 04, 2015 by José Luis Gutiérrez
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

hooks.c proto-ext-whiterabbit/hooks.c +5 -5

state-listening.c proto-standard/state-listening.c +3 -2

state-pmaster.c proto-standard/state-pmaster.c +2 -1

No files found.
--- a/proto-ext-whiterabbit/hooks.c
+++ b/proto-ext-whiterabbit/hooks.c
@@ -17,11 +17,11 @@ static int wr_init(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	wp->calibrated = !WR_DEFAULT_PHY_CALIBRATION_REQUIRED;

 	/* GUTI BAD HACK */
-	if(WR_DSCUR(ppi)->primarySlavePortNumber == ppi->port_idx) {
-		 wp->ops->enable_timing_output(ppi, 1);
-	}else{
-		wp->ops->enable_timing_output(ppi, 0);
-	}
+	//if(ppi->port_idx == GLBS(ppi)->active_backup_port) {
+		 //wp->ops->enable_timing_output(ppi, 1);
+	//}else{
+		//wp->ops->enable_timing_output(ppi, 0);
+	//}

 	/* For any reason, when new linkUp, PPS output is disabled although 
 	 * it is the correct port... */

--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -14,9 +14,10 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	int e = 0; /* error var, to check errors in msg handling */
 	
 	struct wr_dsport *wrp_hsr0 = WR_DSPOR(INST(ppi->glbs, 0));
-	struct wr_dsport *wrp_hsr1= WR_DSPOR(INST(ppi->glbs, 1));
+	struct wr_dsport *wrp_hsr1 = WR_DSPOR(INST(ppi->glbs, 1));
+	struct wr_dsport *wrp_hsr2 = WR_DSPOR(INST(ppi->glbs, 2));

-	if(wrp_hsr0->wrModeOn) {
+	if(wrp_hsr0->wrModeOn || wrp_hsr1->wrModeOn || wrp_hsr2->wrModeOn) {
 		ppi->master_only = 1;
 		ppi->slave_only = 0;
 		ppi->backup_only = 0;

--- a/proto-standard/state-pmaster.c
+++ b/proto-standard/state-pmaster.c
@@ -17,8 +17,9 @@ int pp_pmaster(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	
 	struct wr_dsport *wrp_hsr0 = WR_DSPOR(INST(ppi->glbs, 0));
 	struct wr_dsport *wrp_hsr1 = WR_DSPOR(INST(ppi->glbs, 1));
+	struct wr_dsport *wrp_hsr2 = WR_DSPOR(INST(ppi->glbs, 2));

-	if(wrp_hsr0->wrModeOn || wrp_hsr1->wrModeOn){
+	if(wrp_hsr0->wrModeOn || wrp_hsr1->wrModeOn || wrp_hsr2->wrModeOn){
 		ppi->master_only = 0;
 		ppi->slave_only = 0;
 		ppi->backup_only = 1;