From 2a6f892b61a0ad199e1aa763e8a3ae4a98d28ee0 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Fri, 20 Feb 2004 20:32:39 +0000
Subject: [PATCH] Changes for 3.14
---
iocBoot/iocUnix/13element.cmd | 12 ++++++------
iocBoot/iocUnix/3element.cmd | 10 +++++-----
iocBoot/iocUnix/scanParms.substitutions | 10 +---------
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/iocBoot/iocUnix/13element.cmd b/iocBoot/iocUnix/13element.cmd
index 631f648..95ad588 100644
--- a/iocBoot/iocUnix/13element.cmd
+++ b/iocBoot/iocUnix/13element.cmd
@@ -1,9 +1,9 @@
# AIMConfig(serverName, int etherAddr, int port, int maxChans,
# int maxSignals, int maxSequences, etherDev, queueSize)
-AIMConfig("AIM2/1", 0x98c, 1, 4000, 4, 1, "ei0", 100)
-AIMConfig("AIM2/2", 0x98d, 2, 4000, 4, 1, "ei0", 100)
-AIMConfig("AIM3/1", 0x98b, 1, 4000, 4, 1, "ei0", 100)
-AIMConfig("AIM3/2", 0x903, 2, 4000, 4, 1, "ei0", 100)
+AIMConfig("AIM2/1", 0x98c, 1, 4000, 4, 1, "eth0", 100)
+AIMConfig("AIM2/2", 0x98d, 2, 4000, 4, 1, "eth0", 100)
+AIMConfig("AIM3/1", 0x98b, 1, 4000, 4, 1, "eth0", 100)
+AIMConfig("AIM3/2", 0x903, 2, 4000, 4, 1, "eth0", 100)
-dbLoadRecords("mcaApp/Db/13element.db","P=xxx:med:,N=2000", mca)
-dbLoadTemplate("13element.substitutions", mca)
+dbLoadRecords("$(MCA)/mcaApp/Db/13element.db","P=xxx:med:,N=2000")
+dbLoadTemplate("13element.substitutions")
diff --git a/iocBoot/iocUnix/3element.cmd b/iocBoot/iocUnix/3element.cmd
index 738afd8..26890ee 100644
--- a/iocBoot/iocUnix/3element.cmd
+++ b/iocBoot/iocUnix/3element.cmd
@@ -1,8 +1,8 @@
# AIMConfig(serverName, int etherAddr, int port, int maxChans,
# int maxSignals, int maxSequences, etherDev, queueSize)
-AIMConfig("AIM1/1", 0xa78, 1, 2048, 1, 1, "ei0", 100)
-AIMConfig("AIM1/2", 0xa78, 2, 2048, 1, 1, "ei0", 100)
-AIMConfig("AIM2/1", 0xa79, 1, 2048, 1, 1, "ei0", 100)
+AIMConfig("AIM1/1", 0xa78, 1, 2048, 1, 1, "eth0", 100)
+AIMConfig("AIM1/2", 0xa78, 2, 2048, 1, 1, "eth0", 100)
+AIMConfig("AIM2/1", 0xa79, 1, 2048, 1, 1, "eth0", 100)
-dbLoadRecords("mcaApp/Db/3element.db","P=xxx:med:,N=2000", mca)
-dbLoadTemplate("3element.substitutions", mca)
+dbLoadRecords("$(MCA)/mcaApp/Db/3element.db","P=xxx:med:,N=2000")
+dbLoadTemplate("3element.substitutions")
diff --git a/iocBoot/iocUnix/scanParms.substitutions b/iocBoot/iocUnix/scanParms.substitutions
index 8621589..cfe432b 100644
--- a/iocBoot/iocUnix/scanParms.substitutions
+++ b/iocBoot/iocUnix/scanParms.substitutions
@@ -1,4 +1,4 @@
-file "$(STD)/db/scanParms.db"
+file "$(SSCAN)/sscanApp/Db/scanParms.db"
{
{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS=$(Q).VAL,RDBK=$(Q).RBV}
{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS=$(Q).VAL,RDBK=$(Q).RBV}
@@ -8,14 +8,6 @@ file "$(STD)/db/scanParms.db"
{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS=$(Q).VAL,RDBK=$(Q).RBV}
{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS=$(Q).VAL,RDBK=$(Q).RBV}
{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m9,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m10,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m11,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m12,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m13,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m14,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m15,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m16,POS=$(Q).VAL,RDBK=$(Q).RBV}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}
--
GitLab