[hack] enables to disable interrupts in LM32 - a hackish way to stop PLL loop…

[hack] enables to disable interrupts in LM32 - a hackish way to stop PLL loop and let the VXCO running on its own - was done purely experimentally

[hack] enables to disable interrupts in LM32 - a hackish way to stop PLL loop…
[hack] enables to disable interrupts in LM32 - a hackish way to stop PLL loop and let the VXCO running on its own - was done purely experimentally
06bb7dfa · Maciej Lipinski · 0e943965 · 06bb7dfa · 06bb7dfa · 06bb7dfa
Commit 06bb7dfa authored May 28, 2014 by Maciej Lipinski
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

wr_servo.c PTPWRd/dep/wr_servo.c +4 -1

protocol.c PTPWRd/protocol.c +11 -4

ptpd.h PTPWRd/ptpd.h +1 -0

softpll_ng.c softpll/softpll_ng.c +2 -0

No files found.
--- a/PTPWRd/dep/wr_servo.c
+++ b/PTPWRd/dep/wr_servo.c
@@ -36,7 +36,10 @@ void wr_servo_enable_tracking(int enable)
 {
 	tracking_enabled = enable;
 }
-
+int wr_servo_tracking_get()
+{
+	return tracking_enabled;
+}

 static void dump_timestamp(char *what, wr_timestamp_t ts)
 {

--- a/PTPWRd/protocol.c
+++ b/PTPWRd/protocol.c
@@ -140,14 +140,18 @@ void multiProtocol(RunTimeOpts *rtOpts, PtpPortDS *ptpPortDS)

        ptpPortDS[i].linkUP = FALSE;
    }
-
+PTPD_TRACE(TRACE_ERROR, NULL,"ML: hacked\n");
    for(;;)
    {
      for (i=0; i < rtOpts->portNumber; i++)
        singlePortLoop(rtOpts, &ptpPortDS[i], i);
        
      sharedPortsLoop(ptpPortDS);
-
+      if(wr_servo_tracking_get() == 0)
+      {
+        netDisablePhaseTracking(&ptpPortDS[0].netPath);
+        PTPD_TRACE(TRACE_ERROR, NULL,"ML: hacked-> irq of LM32 off\n");
+      }
      ptpd_handle_wripc();
      usleep(1000);
    }
@@ -156,8 +160,11 @@ void multiProtocol(RunTimeOpts *rtOpts, PtpPortDS *ptpPortDS)

 void hack(RunTimeOpts *rtOpts, PtpPortDS *ptpPortDS)
 {
-    netDisablePhaseTracking(&ptpPortDS[0].netPath);
-    PTPD_TRACE(TRACE_ERROR, NULL,"ML: hacked-> irq of LM32 off\n");
+    if(wr_servo_tracking_get() == 0)
+    {
+      netDisablePhaseTracking(&ptpPortDS[0].netPath);
+      PTPD_TRACE(TRACE_ERROR, NULL,"ML: hacked-> irq of LM32 off\n");
+    }
 }

 #endif

--- a/PTPWRd/ptpd.h
+++ b/PTPWRd/ptpd.h
@@ -240,6 +240,7 @@ extern void issueWRSignalingMsg(Enumeration16 wrMessageID,RunTimeOpts *rtOpts,Pt
 #endif

 extern void wr_servo_enable_tracking(int enable);
+extern int wr_servo_tracking_get();
 extern int wr_servo_man_adjust_phase(int phase);

 /* The code used pow(2, ...) but we don't want floating point here (ARub) */

--- a/softpll/softpll_ng.c
+++ b/softpll/softpll_ng.c
@@ -469,7 +469,9 @@ void spll_enable_ptracker(int ref_channel, int enable)
 		ptracker_mask &= ~(1<<ref_channel);
 		if(ref_channel != softpll.mpll.id_ref)
 			spll_enable_tagger(ref_channel, 0);
+		disable_irq();
 		TRACE_DEV("Disabling ptracker tagger: %d\n", ref_channel);
+		TRACE_DEV("ML-hack - disable interrupt\n", ref_channel);
 	}
 }