From 27384fa622f766c35beb07b908e3f7c896315792 Mon Sep 17 00:00:00 2001
From: Rolf Bork <rolf.bork@ligo.org>
Date: Thu, 11 Jan 2018 19:53:20 +0000
Subject: [PATCH] Updated NEWS file. Changed FE code uptime EPICS variables to
ao instead of ai records.
git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4632 6dcd42c9-f523-4c6d-aada-af552506706e
---
NEWS | 7 ++++++-
src/epics/util/feCodeGen.pl | 6 +++---
src/fe/controllerIop.c | 4 +---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index 50a6e6e09..5abd6d91e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,14 @@
==================================================================================================
-Changes for 4.0 (NOT YET RELEASED)
+Changes for 3.5 (NOT YET RELEASED)
==================================================================================================
- daqLib.c and supporting components modified to send out GDS TP data via separate shared memory
area for use with new ZMQ DAQ transmission software.
- RCG now builds user space code as well as kernel objects.
+- controller.c and moduleLoad.c now split into new files to clean out #defs:
+ - controllerIop.c and moduleLoadIop.c for IOP model builds.
+ - controllerApp.c and moduleLoadApp.c for user application model builds.
+- Removed /proc entries from all FE code. This should alleviate issue with change to /proc
+ in later Linux kernels.
==================================================================================================
Changes for 3.4 (NOT YET RELEASED)
==================================================================================================
diff --git a/src/epics/util/feCodeGen.pl b/src/epics/util/feCodeGen.pl
index 30582bd0c..ce1836156 100755
--- a/src/epics/util/feCodeGen.pl
+++ b/src/epics/util/feCodeGen.pl
@@ -1341,9 +1341,9 @@ for($ii=0;$ii<32;$ii++)
}
print OUTH "\tint startgpstime;\n";
print EPICS "OUTVARIABLE FEC\_$dcuId\_START_GPS epicsOutput.startgpstime int ao 0\n";
-print EPICS "DUMMY FEC\_$dcuId\_UPTIME_DAY int ai 0\n";
-print EPICS "DUMMY FEC\_$dcuId\_UPTIME_HOUR int ai 0\n";
-print EPICS "DUMMY FEC\_$dcuId\_UPTIME_MINUTE int ai 0\n";
+print EPICS "DUMMY FEC\_$dcuId\_UPTIME_DAY int ao 0\n";
+print EPICS "DUMMY FEC\_$dcuId\_UPTIME_HOUR int ao 0\n";
+print EPICS "DUMMY FEC\_$dcuId\_UPTIME_MINUTE int ao 0\n";
# The following code is in solely for automated testing.
diff --git a/src/fe/controllerIop.c b/src/fe/controllerIop.c
index f3c686d56..b1073d464 100644
--- a/src/fe/controllerIop.c
+++ b/src/fe/controllerIop.c
@@ -1647,9 +1647,7 @@ udelay(1000);
/// \> Compute code cycle time diag information.
cycleTime = (cpuClock[CPU_TIME_CYCLE_END] - cpuClock[CPU_TIME_CYCLE_START])/CPURATE;
if (longestWrite2 < ((tempClock[3]-tempClock[2])/CPURATE)) longestWrite2 = (tempClock[3]-tempClock[2])/CPURATE;
- if (cycleTime > (1000000/CYCLE_PER_SECOND)) {
- // printf("cycle %d time %d; adcWait %d; write1 %d; write2 %d; longest write2 %d\n", cycleNum, cycleTime, adcWait, (tempClock[1]-tempClock[0])/CPURATE, (tempClock[3]-tempClock[2])/CPURATE, longestWrite2);
- }
+ if(cycleTime > 20) printf("Long Cycle = at cycle %d\n",cycleTime,cycleNum);
// Hold the max cycle time over the last 1 second
if(cycleTime > timeHold) {
timeHold = cycleTime;
--
GitLab