diff --git a/NEWS b/NEWS index 50a6e6e09d00571329dacd909da713dcc279a71a..5abd6d91e0a95be210de632b8caec54c90c657ee 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 30582bd0c9b2fb7d5ddcb47ad9224d7bfe3e148c..ce1836156e30b429f494eab9ec424821b67d9cef 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 f3c686d569a3ba1f8141fa85a60944bd6a96456c..b1073d4642c3557a6f987b06915dbf6e1dbd8c6f 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;