feat: MTCA EVR: FP, Univ, BP inputs; PCIe EVR: FP, Univ inputs.

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

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/evrMrmApp/src/drvemSetup.cpp b/evrMrmApp/src/drvemSetup.cpp
@@ -184,10 +184,12 @@ static const EVRMRM::Config mtca_evr_300 = {
     2,  // FP Delay outputs
     0,  // CML/GTX outputs
     MRMCML::typeTG300,
-    /*  0 <= N <= 3  : FPInMap   */
-    /*  4 <= N <= 23 : UnivInMap */
-    /* 24 <= N <= 31 : BPInMap   */
-    32,  // FP inputs total
+    /**
+     * 0 <= N <= 3   : FPInMap
+     * 4 <= N <= 23  : UnivInMap
+     * 24 <= N <= 31 : BPInMap
+     */
+    32,  // FP, Univ, BP inputs
 };
 
 static const EVRMRM::Config pcie_evr_300 = {
@@ -201,7 +203,11 @@ static const EVRMRM::Config pcie_evr_300 = {
     0,  // FP Delay outputs
     0,  // CML/GTX outputs
     MRMCML::typeTG300,
-    2,  // FP inputs
+    /**
+     * 0 <= N <= 3  : FPInMap
+     * 4 <= N <= 23 : UnivInMap
+     */
+    24,  // FP, Univ inputs
 };
 
 static const EVRMRM::Config cpci_evr_unknown = {

diff --git a/evrMrmApp/src/evrRegMap.h b/evrMrmApp/src/evrRegMap.h
@@ -271,9 +271,12 @@
 #  define InputMapFP_ext_shft  0
 #  define InputMapFPMax 32
 
-/*  0 <= N <= 3  : FPInMap   */
-/*  4 <= N <= 23 : UnivInMap */
-/* 24 <= N <= 31 : BPInMap   */
+/**
+ * 0 <= N <= 3   : FPInMap
+ * 4 <= N <= 23  : UnivInMap
+ * 24 <= N <= 31 : BPInMap
+ * FP, Univ, BP map
+ */
 #define U32_InputMapFP(N)  (U32_InputMapFPN  + (4*(N)))
 
 /* GTX delay */