From fc8b006c985897446e5e422c370d01077c728196 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Fri, 4 Feb 2005 19:59:12 +0000
Subject: [PATCH] Converted from MPF to asyn, icb_tca now required 'MCA' macro
---
iocBoot/iocvxWorks/canberra_3.substitutions | 40 +++++++++++----------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/iocBoot/iocvxWorks/canberra_3.substitutions b/iocBoot/iocvxWorks/canberra_3.substitutions
index 07ea343..d7eebbf 100644
--- a/iocBoot/iocvxWorks/canberra_3.substitutions
+++ b/iocBoot/iocvxWorks/canberra_3.substitutions
@@ -1,39 +1,41 @@
file "$(MCA)/mcaApp/Db/simple_mca.db"
{
pattern
-{P M DTYP INP PREC CHANS}
-{xxx:med: mca1 "MPF MCA" "#C0 S0 @AIM2/1" 3 2048}
-{xxx:med: mca2 "MPF MCA" "#C0 S1 @AIM2/1" 3 2048}
-{xxx:med: mca3 "MPF MCA" "#C0 S2 @AIM2/1" 3 2048}
-{xxx:med: mca0 "Soft Channel" "#C0 S0 @" 3 2048}
+{P M DTYP INP PREC CHANS}
+{xxx:med: mca1 "asynMCA" "@asyn(AIM1/1 0)" 3 2048}
+{xxx:med: mca2 "asynMCA" "@asyn(AIM1/2 0)" 3 2048}
+{xxx:med: mca3 "asynMCA" "@asyn(AIM2/1 0)" 3 2048}
+{xxx:med: mca0 "Soft Channel" "" 3 2048}
}
#file "$(MCA)/mcaApp/Db/icb_amp.db"
#{
#pattern
-#{P AMP CARD SERVER ADDR}
-#{xxx:med: amp1 0 "AIM2/1" 1}
-#{xxx:med: amp2 0 "AIM2/1" 2}
-#{xxx:med: amp3 0 "AIM2/1" 3}
+#{P AMP PORT}
+#{xxx:med: amp1 icbAmp1}
#}
file "$(MCA)/mcaApp/Db/icb_adc.db"
{
pattern
-{P ADC CARD SERVER ADDR}
-{xxx:med: adc1 0 "AIM2/1" B}
+{P ADC PORT}
+{xxx:med: adc1 "icbAdc1"}
+{xxx:med: adc2 "icbAdc2"}
+{xxx:med: adc3 "icbAdc3"}
}
#file "$(MCA)/mcaApp/Db/icb_hvps.db"
#{
#pattern
-#{P HVPS LIMIT CARD SERVER ADDR}
-#{xxx:med: hvps1 1000 0 "AIM3/1" A}
+#{P HVPS LIMIT PORT}
+#{xxx:med: hvps1 1000 "icbHvps1"}
#}
-#file "$(MCA)/mcaApp/Db/icb_tca.db"
-#{
-#pattern
-#{P, TCA, CARD SERVER ADDR}
-#{xxx:med:, tca1, 0 "AIM3/1" B}
-#}
+file "$(MCA)/mcaApp/Db/icb_tca.db"
+{
+pattern
+{P, TCA, PORT, MCA}
+{xxx:med:, tca1, "icbTca1", mca1}
+{xxx:med:, tca2, "icbTca2", mca2}
+{xxx:med:, tca3, "icbTca3", mca3}
+}
--
GitLab