From 3f6d874eb67accd3b46bec8548fd2072ca152ebf Mon Sep 17 00:00:00 2001
From: "ezekiel.dohmen" <ezekiel.dohmen@ligo.org>
Date: Fri, 30 Jun 2023 08:58:03 -0700
Subject: [PATCH] Removing system name check to enable FIRs filters, FIRs are
now enabled by the presence of the FIR part
---
src/epics/util/lib/createEpicsMakefile.pm | 2 +-
src/epics/util/lib/createKernelModuleBuildEnv.pm | 4 ++--
src/epics/util/lib/createUserModuleBuildEnv.pm | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/epics/util/lib/createEpicsMakefile.pm b/src/epics/util/lib/createEpicsMakefile.pm
index 1c573fb33..6d926e5e3 100644
--- a/src/epics/util/lib/createEpicsMakefile.pm
+++ b/src/epics/util/lib/createEpicsMakefile.pm
@@ -93,7 +93,7 @@ my ($fileName) = @_;
}
print OUTME "\n";
#print OUTME "LIBFLAGS += -lezca\n";
- if($::systemName eq "sei" || $::useFIRs)
+ if($::useFIRs)
{
print OUTME "EXTRA_CFLAGS += -DFIR_FILTERS\n";
}
diff --git a/src/epics/util/lib/createKernelModuleBuildEnv.pm b/src/epics/util/lib/createKernelModuleBuildEnv.pm
index 47c445561..f2397c8eb 100644
--- a/src/epics/util/lib/createKernelModuleBuildEnv.pm
+++ b/src/epics/util/lib/createKernelModuleBuildEnv.pm
@@ -91,9 +91,9 @@ print OUTM "_CODE\n";
print OUTM "EXTRA_CFLAGS += -DFE_HEADER=\\\"\L$::skeleton.h\\\"\n";
# Model uses FIR filters
-if($::systemName eq "sei" || $::useFIRs)
+if($::useFIRs)
{
-print OUTM "EXTRA_CFLAGS += -DFIR_FILTERS\n";
+ print OUTM "EXTRA_CFLAGS += -DFIR_FILTERS\n";
}
print OUTM "EXTRA_CFLAGS += -g\n";
diff --git a/src/epics/util/lib/createUserModuleBuildEnv.pm b/src/epics/util/lib/createUserModuleBuildEnv.pm
index dfa0683c4..900988491 100644
--- a/src/epics/util/lib/createUserModuleBuildEnv.pm
+++ b/src/epics/util/lib/createUserModuleBuildEnv.pm
@@ -95,7 +95,7 @@ my ($makefileDir) = @_;
if ($::remoteGPS) {
print OUTM "list(APPEND CFLAGS \"-DREMOTE_GPS\")\n";
}
- if($::systemName eq "sei" || $::useFIRs)
+ if($::useFIRs)
{
print OUTM "list(APPEND CFLAGS \"-DFIR_FILTERS\")\n";
}
--
GitLab