From b9ad6a9491eb5fa6a52c6fc359527585d7605cc7 Mon Sep 17 00:00:00 2001
From: Rolf Bork <rbork@caltech.edu>
Date: Mon, 18 May 2020 20:44:59 -0500
Subject: [PATCH] Fix for IOP configured as Dolphin timing slave. Main issue
was extra space in my ifdef TIME_SLAVE in time_slave_io.c, therefore code not
compiled correctly and reverted to internal timer.
---
src/include/drv/time_slave_io.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/include/drv/time_slave_io.c b/src/include/drv/time_slave_io.c
index 9b15762e2..c082034a8 100644
--- a/src/include/drv/time_slave_io.c
+++ b/src/include/drv/time_slave_io.c
@@ -25,8 +25,9 @@ inline unsigned int
sync2master( volatile TIMING_SIGNAL* timePtr )
{
int loop = 0;
- int cycle = 0;
+ int cycle = 65535;
+printk("sync to master %d\n",timePtr->gps_time);
do
{
udelay( 5 );
@@ -103,7 +104,7 @@ iop_adc_read( adcInfo_t* adcinfo, int cpuClk[] )
int iocycle = 0;
// Read ADC data
-#ifdef TIMIE_SLAVE
+#ifdef TIME_SLAVE
missedCycle = waitPcieTimingSignal( pcieTimer, cycleNum );
timeSec = pcieTimer->gps_time;
#else
--
GitLab