From 7b7d77f8578f3eea4f5d6e973f10d5aeb6a0a6c3 Mon Sep 17 00:00:00 2001
From: Rolf Bork <rolf.bork@ligo.org>
Date: Tue, 8 Nov 2016 20:59:52 +0000
Subject: [PATCH] Added support for Dolphin PCIe network Gen 2. Assumes new
Dolphin IX code installed at /opt/Dolphin5.
git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4293 6dcd42c9-f523-4c6d-aada-af552506706e
---
src/epics/util/feCodeGen.pl | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/epics/util/feCodeGen.pl b/src/epics/util/feCodeGen.pl
index e5f451d6f..0bb7d7edf 100755
--- a/src/epics/util/feCodeGen.pl
+++ b/src/epics/util/feCodeGen.pl
@@ -1753,6 +1753,7 @@ print "\tPart number is $remoteGpsPart\n";
if($virtualiop == 1) {
print OUT "#include \"$rcg_src_dir/src/fe/controllerVirtual.c\"\n";
} elsif($virtualiop > 1) {
+#This is a Dolphin switch
print OUT "#include \"$rcg_src_dir/src/fe/controllerSwitch.c\"\n";
} else {
print OUT "#include \"$rcg_src_dir/src/fe/controller.c\"\n";
@@ -2514,17 +2515,20 @@ if ($rfmTimeSlave > -1) {
if ($flipSignals) {
print OUTM "EXTRA_CFLAGS += -DFLIP_SIGNALS=1\n";
}
-if ($pciNet > -1) {
- print OUTM "#Enable use of PCIe RFM Network\n";
+if ($pciNet == 1) {
+ print OUTM "#Enable use of PCIe RFM Network Gen 1\n";
print OUTM "DISDIR = /opt/srcdis\n";
print OUTM "EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_KERNEL=1 -I\$(DISDIR)/src/IRM/drv/src -I\$(DISDIR)/src/IRM/drv/src/LINUX -I\$(DISDIR)/src/include -I\$(DISDIR)/src/include/dis -DDOLPHIN_TEST=1 -DDIS_BROADCAST=0x80000000\n";
+} elsif($pciNet == 2) {
+ print OUTM "#Enable use of PCIe RFM Network Gen 2\n";
+ print OUTM "DISDIR = /opt/Dolphin5/DIS\n";
+ print OUTM "EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_KERNEL=1 -I\$(DISDIR)/src/IRM_GX/drv/src -I\$(DISDIR)/src/IRM_GX/drv/src/LINUX -I\$(DISDIR)/src/include -I\$(DISDIR)/src/include/dis -I\$(DISDIR)/src/COMMON/osif/kernel/include -I\$(DISDIR)/src/COMMON/osif/kernel/include/LINUX -DDOLPHIN_TEST=1 -DDIS_BROADCAST=0x80000000\n";
} else {
print OUTM "#Uncomment to use PCIe RFM Network\n";
print OUTM "#DISDIR = /home/controls/DIS\n";
print OUTM "#EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_KERNEL=1 -I\$(DISDIR)/src/IRM/drv/src -I\$(DISDIR)/src/IRM/drv/src/LINUX -I\$(DISDIR)/src/include -I\$(DISDIR)/src/include/dis -DDOLPHIN_TEST=1 -DDIS_BROADCAST=0x80000000\n";
}
-if ($pciNet > 1) {
-#This is a Dolphin switch
+if($virtualiop > 1) {
print OUTM "EXTRA_CFLAGS += -DDOLPHIN_SWITCH=1\n";
}
if ($specificCpu > -1) {
--
GitLab