softpll: VERY UGLY slave mode fix (helper should use RX clock instead of REF…

softpll: VERY UGLY slave mode fix (helper should use RX clock instead of REF clock in slave mode...)

softpll: VERY UGLY slave mode fix (helper should use RX clock instead of REF…
softpll: VERY UGLY slave mode fix (helper should use RX clock instead of REF clock in slave mode...)
1c5873ff · Tomasz Wlostowski · Alessandro Rubini · fcaf3bed · 1c5873ff
Commit 1c5873ff authored Oct 25, 2013 by Tomasz Wlostowski Committed by Alessandro Rubini Jan 12, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

softpll_ng.c rt/softpll/softpll_ng.c +8 -4

No files found.
--- a/rt/softpll/softpll_ng.c
+++ b/rt/softpll/softpll_ng.c
@@ -92,9 +92,7 @@ static inline void start_ptrackers(struct softpll_state *s)

 static inline void update_ptrackers(struct softpll_state *s, int tag_value, int tag_source)
 {
-	ptracker_mask |= (1<<spll_n_chan_ref);
-	
-	if(tag_source >= spll_n_chan_ref)
+	if(tag_source > spll_n_chan_ref)
 		return;
 		
 	ptrackers_update(s->ptrackers, tag_value, tag_source);
@@ -342,8 +340,14 @@ void spll_init(int mode, int slave_ref_channel, int align_pps)
 	else
 		s->seq_state = SEQ_CLEAR_DACS;

+	int helper_ref;
+	
+	if( mode == SPLL_MODE_SLAVE)
+		helper_ref = slave_ref_channel; // Slave mode: lock the helper to an uplink port
+	else
+		helper_ref = spll_n_chan_ref; // Master/GM mode: lock the helper to the local ref clock

-	helper_init(&s->helper, spll_n_chan_ref);
+	helper_init(&s->helper, helper_ref);
 	mpll_init(&s->mpll, slave_ref_channel, spll_n_chan_ref);

 	for (i = 0; i < spll_n_chan_out - 1; i++) {