]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
Update register in input monitor xml
authorJan Michel <j.michel@gsi.de>
Fri, 26 Apr 2019 11:26:39 +0000 (13:26 +0200)
committerJan Michel <j.michel@gsi.de>
Fri, 26 Apr 2019 11:26:39 +0000 (13:26 +0200)
xml-db/database/InputMonitorTrb3sc.xml

index bb0cc7ba3df32e3b51f7d8a9319d852ef49ef16e..9851f06312a846f895d781940a4bdbcf5f530d82 100644 (file)
@@ -9,15 +9,37 @@
   <group name="MonitorRegs" purpose="config" address="0080" size="16" mode="rw" continuous="true">
     <description>Registers of the input monitoring</description>
     <register name="MonitorEnable" address="0000"  mode="rw" >
-      <description>Enables individual inputs for monitoring</description>
+      <description>Enables individual inputs 31-0 for monitoring</description>
       <field  name="MonitorEnable" start="0" bits="32" format="bitmask" noflag="true">
       </field>
     </register>
+    <register name="MonitorEnable2" address="0005"  mode="rw" >
+      <description>Enables individual inputs 63-32 for monitoring</description>
+      <field  name="MonitorEnable2" start="0" bits="32" format="bitmask" noflag="true">
+      </field>
+    </register>
+    <register name="MonitorEnable3" address="0007"  mode="rw" >
+      <description>Enables individual inputs 95-64 for monitoring</description>
+      <field  name="MonitorEnable3" start="0" bits="32" format="bitmask" noflag="true">
+      </field>
+    </register>    
+    
     <register name="MonitorInvert" address="0001" mode="rw" >
-      <description>Inverts individual inputs for monitoring</description>
+      <description>Inverts individual inputs 31-0 for monitoring</description>
       <field  name="MonitorInvert" start="0" bits="32" format="bitmask" noflag="true">
       </field>
     </register>
+    <register name="MonitorInvert2" address="0006" mode="rw" >
+      <description>Inverts individual inputs 63-32 for monitoring</description>
+      <field  name="MonitorInvert2" start="0" bits="32" format="bitmask" noflag="true">
+      </field>
+    </register>
+    <register name="MonitorInvert3" address="0008" mode="rw" >
+      <description>Inverts individual inputs 95-64 for monitoring</description>
+      <field  name="MonitorInvert3" start="0" bits="32" format="bitmask" noflag="true">
+      </field>
+    </register>    
+    
     <register name="MonitorRate" address="0002" mode="rw" >
       <description>Sets the rate at which values are written to the fifo.</description>
       <field  name="MonitorRate" start="0" bits="32" format="unsigned" unit="ns" scale="10" noflag="true">
          <description>Word counter of Fifo control logic</description>
       </field>
     </register>    
-    <register name="MonitorInput" address="000e" mode="r" >
-      <description>Current status of all inputs</description>
+    
+    
+    <register name="MonitorInput" address="000c" mode="r" >
+      <description>Current status of all inputs 31-0 </description>
       <field  name="MonitorInput" start="0"   bits="31" format="bitmask">
       </field>
+    </register> 
+    <register name="MonitorInput2" address="000d" mode="r" >
+      <description>Current status of all inputs 63-32 </description>
+      <field  name="MonitorInput2" start="0"   bits="31" format="bitmask">
+      </field>
+    </register> 
+    <register name="MonitorInput3" address="000e" mode="r" >
+      <description>Current status of inputs 95-64 </description>
+      <field  name="MonitorInput3" start="0"   bits="31" format="bitmask">
+      </field>
     </register>    
+    
     <register name="MonitorTrigger" address="000f" mode="rw" >
       <description>Control signals for fifo and counters</description>
       <field  name="MonitorRecord" start="0" mode="w"  bits="1" format="bitmask">
       <field  name="MonitorResetCounters" start="1" mode="w"  bits="1" format="bitmask">
          <description>Reset all counters</description>
       </field>
-      <field  name="MonitorInputNumber" start="8" mode="r"  bits="5" format="unsigned">
+      <field  name="MonitorInputNumber" start="8" mode="r"  bits="7" format="unsigned">
          <description>Number of input signals</description>
       </field>
       <field  name="MonitorSingleFifo" start="15" mode="r"  bits="1" format="boolean">
          <description>Shows if the design contains a single monitoring fifo only and not one for each input</description>
       </field>
-      <field  name="MonitorFifoSelect" start="16" mode="rw"  bits="5" format="unsigned">
+      <field  name="MonitorFifoSelect" start="16" mode="rw"  bits="7" format="unsigned">
          <description>Select the input signal to the Fifo, if the single-fifo version is implemented</description>
       </field>
-      <field  name="ExtTrigSelect" start="24" mode="rw"  bits="5" format="unsigned">
+      <field  name="ExtTrigSelect" start="24" mode="rw"  bits="7" format="unsigned">
          <description>Select the input channel used as external trigger</description>
       </field>      
       <field  name="ExtTrigEnable" start="31" mode="rw"  bits="5" format="boolean">
     </fifo>    
   </group>
   
-  <group name="MonitorCounters" purpose="statistics" address="00c0" size="32" mode="r" continuous="true">
+  <group name="MonitorCounters" purpose="statistics" address="00c0" size="96" mode="r" continuous="true">
     <description>Current counter value for each input</description>  
     <register name="MonitorCounter" address="0000" mode="r" repeat="32" >
       <description>Current value of the input edge counter</description>