From 73b8e52157baaad905cef6a53c34cf225c21dd87 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Wed, 6 Apr 2005 18:22:05 +0000
Subject: [PATCH] configured to agree with default setup in mca (no Linux
support for Canberra)
---
iocBoot/iocLinux/st.cmd | 2 +-
xxxApp/src/iocxxxLinuxInclude.dbd | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/iocBoot/iocLinux/st.cmd b/iocBoot/iocLinux/st.cmd
index d3e79a0..273615a 100644
--- a/iocBoot/iocLinux/st.cmd
+++ b/iocBoot/iocLinux/st.cmd
@@ -97,7 +97,7 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=2,M_PHI1=m11,M_PHI2=m12")
# Load single element Canberra AIM MCA and ICB modules
-< canberra_1.cmd
+#< canberra_1.cmd
# Load 13 element detector software
#< canberra_13.cmd
diff --git a/xxxApp/src/iocxxxLinuxInclude.dbd b/xxxApp/src/iocxxxLinuxInclude.dbd
index 071f465..58b0e6a 100644
--- a/xxxApp/src/iocxxxLinuxInclude.dbd
+++ b/xxxApp/src/iocxxxLinuxInclude.dbd
@@ -2,7 +2,8 @@
include "xxxCommonInclude.dbd"
# If your host supports libpcap and libnet and you want to build Canberra network
# support uncomment the following line
-include "mcaCanberraSupport.dbd"
+# (Support build is commented out of mca/mcaApp/CanberraSrc/Makefile)
+#include "mcaCanberraSupport.dbd"
# If you want to build parallel port interface to Saturn DXP uncomment the following line
include "dxpSupport.dbd"
--
GitLab