feat: Simple all 32 input implementation to handle Univ and BP inputs.

icshwi · Apr 14, 2020 · a71dc35 · a71dc35
1 parent 84fd380
commit a71dc35
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ html/
 rtf
 *.local
 .DS_Store
+.vscode
 
 #documentation output
 epics-*

diff --git a/evrMrmApp/src/drvemSetup.cpp b/evrMrmApp/src/drvemSetup.cpp
@@ -184,7 +184,10 @@ static const EVRMRM::Config mtca_evr_300 = {
     2,  // FP Delay outputs
     0,  // CML/GTX outputs
     MRMCML::typeTG300,
-    2,  // FP inputs
+    /*  0 <= N <= 3  : FPInMap   */
+    /*  4 <= N <= 23 : UnivInMap */
+    /* 24 <= N <= 31 : BPInMap   */
+    32,  // FP inputs total
 };
 
 static const EVRMRM::Config pcie_evr_300 = {

diff --git a/evrMrmApp/src/evrRegMap.h b/evrMrmApp/src/evrRegMap.h
@@ -269,9 +269,11 @@
 #  define InputMapFP_back_shft 8
 #  define InputMapFP_ext_mask  0x000000ff
 #  define InputMapFP_ext_shft  0
-#  define InputMapFPMax 2
+#  define InputMapFPMax 32
 
-/* 0 <= N <= 1 */
+/*  0 <= N <= 3  : FPInMap   */
+/*  4 <= N <= 23 : UnivInMap */
+/* 24 <= N <= 31 : BPInMap   */
 #define U32_InputMapFP(N)  (U32_InputMapFPN  + (4*(N)))
 
 /* GTX delay */
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ html/ @@
     rtf
     *.local
     .DS_Store
+    .vscode
     #documentation output
     epics-*
@@ Expand Down @@