From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Mon, 3 Mar 2014 23:59:01 +0000 (+0100)
Subject: nxyter register updates
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=32bace2d242501c78941a90ecdfaaf79e7fc55f9;p=daqtools.git

nxyter register updates
---

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 6704ec4..c801b92 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -7,7 +7,7 @@
   <description>Registers for the Nxyter Readout</description>
 
   <group name="DataValidate"
-         address="0120"  size="9"  purpose="status"  mode="r"  continuous="true">
+         address="0120"  size="11"  purpose="status"  mode="r"  continuous="true">
 
     <register name="InvalidFrames" address="0000" purpose="status">
       <description>Number of invalid frames</description>
@@ -23,6 +23,16 @@
       <description>Pileup Counter</description>
       <field name="PileupCount" start="0" bits="16" format="unsigned" />
     </register>
+ 
+    <register name="PileupRate" address="0009" purpose="status" mode="r">
+      <description>Pileup Rate</description>
+      <field name="PileupRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
+    
+    <register name="OverflowRate" address="000a" purpose="status" mode="r">
+      <description>Overflow Rate</description>
+      <field name="OverflowRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
 
     <register name="ParityErrorCount" address="0003" purpose="status">
       <description>Parity Error Counter</description>
@@ -41,7 +51,8 @@
         <field name="FrameRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
       </register>
     </group>
-
+    
+   
     <register name="ADCValue" address="0006" purpose="status" mode="r">
       <description>Last valid ADC value</description>
       <field name="ADCValue" start="0" bits="12" format="unsigned"/>
@@ -51,12 +62,11 @@
       <description>Average of last valid ADC Values</description>
       <field name="ADCAverage" start="0" bits="12" format="unsigned"/>
     </register>
-    
+        
     <register name="ADCAverageNum" address="0008" purpose="config" mode="rw">
       <description>Number of Averages, power of two (2^n)</description>
       <field name="ADCAverageNum" start="0" bits="4" format="unsigned" />
     </register>
-
   </group>
 
   <!-- ##################################################################### -->
@@ -242,7 +252,29 @@
   <!-- ##################################################################### -->
 
   <group name="DataReceiver"
-         address="0500"  size="19"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="21"  purpose="status"  mode="rw"  continuous="true">
+    <register name="RFrameRate" address="0013" purpose="status" mode="r">
+      <description>Merge of Nxyter and ADC Frame Rates, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
+      <field name="RFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
+
+    <register name="ErrorBits" address="0014" purpose="status" mode="r">
+      <description>Status of Error Bits</description>
+      <field name="NX_Offline"     start="0" bits="1" format="bitmask" purpose="status" mode="r"/>    
+      <field name="Frame_Rate"     start="8" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Rate"        start="1" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Sync"        start="2" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Parity"      start="3" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Err"        start="4" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_PLL"        start="5" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_CLK"        start="6" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Rate"       start="7" bits="1" format="bitmask" purpose="status" mode="r"/>
+    </register>
+
+    <register name="ResetCounter" address="000c" purpose="status" mode="r">
+      <description>Reset Handler Counter</description>
+      <field name="ResetCounter" start="0" bits="16" format="unsigned" />
+    </register>
 
     <register name="CurrentTimestamp" address="0000" purpose="status" mode="r">
       <description>Current Timestamp Value read from Fifo</description>
@@ -304,9 +336,9 @@
       <field name="ADCRValue" start="0" bits="12" format="unsigned"/>
     </register>
 
-    <register name="Reserved0" address="0009" purpose="status" mode="r">
-      <description></description>
-      <field name="Reserved0" start="0" bits="32" format="unsigned"/>
+    <register name="ADCResetCtr" address="0009" purpose="status" mode="r">
+      <description>ADC Reset counter</description>
+      <field name="ADCResetCtr" start="0" bits="32" format="unsigned"/>
     </register>
     
     <register name="Reserved1" address="000a" purpose="config" mode="r">
@@ -319,13 +351,8 @@
       <field name="ADCClockOK" start="0" bits="1" format="boolean" />
     </register>
 
-    <register name="ADCResetCounter" address="000c" purpose="status" mode="r">
-      <description>ADC Handler Reset Counter</description>
-      <field name="ADCResetCounter" start="0" bits="16" format="unsigned" />
-    </register>
-    
     <register name="TSDelay" address="000d" purpose="config" mode="rw">
-      <description>nx_fifo_threshold</description>
+      <description>Delay of Timestamp Fifo</description>
       <field name="TSDelay" start="0" bits="4" format="unsigned" />
     </register>
     
@@ -358,7 +385,7 @@
     <register name="ADCTestValue" address="0012" purpose="status" mode="r">
       <description>ADC Test Channel Value</description>
       <field name="ADCTestValue" start="0" bits="12" format="unsigned"/>
-    </register>
+    </register> 
 
   </group>
   
@@ -492,11 +519,12 @@
         <field name="iTWC" start="0" bits="8" format="unsigned" purpose="config" mode="rw"/>
       </register>  
 
+<!--
       <register name="Spare1" address="001e" purpose="status" repeat="2">
         <description>30..31: Spare</description>
         <field name="Spare1" start="0" bits="32" format="bitmask" purpose="config" mode="r"/>
       </register>
-
+-->
       <register name="Config1" address="0020" purpose="config">
         <description>32: Configuration Register #1</description>
         <field name="TSLSB" start="7" bits="1" format="bitmask" purpose="config" mode="rw">
@@ -537,12 +565,12 @@
           <description>Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..)</description>
         </field>
       </register>  
-   
+<!--
       <register name="Counter" address="0022" purpose="status" repeat="4">
         <description>34..37: Spare</description>
         <field name="Counter" start="0" bits="32" format="bitmask" purpose="config" mode="r"/>
       </register>
-
+-->
       <register name="TPDelay" address="0026" purpose="config">
         <description>38: Testpulse Delay</description>
         <field name="TPDelay" start="0" bits="8" format="unsigned" purpose="config" mode="rw"/>
@@ -553,12 +581,12 @@
         <field name="TTDelay" start="0" bits="8" format="unsigned" purpose="config" mode="rw"/>
       </register>  
    
-   
+ <!--
       <register name="Spare2" address="0028" purpose="status" repeat="3">
         <description>40..42: Spare</description>
         <field name="Spare2" start="0" bits="32" format="bitmask" purpose="config" mode="r"/>
       </register>
-      
+ -->     
       <register name="ClkDelay" address="002b" purpose="config" repeat="3">
         <description>43..45: Clock Delay Registers</description>
         <field name="ClkDelay" start="0" bits="8" format="unsigned" purpose="config" mode="rw"/>
@@ -670,7 +698,12 @@
   
   <group name="NXControl"
          address="0103"  size="10"  purpose="status"  mode="rw" continuous="true">
-    
+
+    <register name="ErrorStatus" address="0009" purpose="status" mode="r" >
+      <description>Error Status of all Entities</description>
+      <field name="ErrorStatus" start="0" bits="7" format="bitmask"/>
+    </register>
+
     <register name="SetOffline" address="0000" purpose="config" mode="rw" >
       <description>Force Nxyter Offline Mode</description>
       <field name="SetOffline" start="0" bits="1" format="boolean"/>
@@ -716,11 +749,6 @@
       <field name="AdcSNotLockCtr" start="0" bits="16" format="unsigned"/>
     </register>
     
-    <register name="ErrorStatus" address="0009" purpose="status" mode="r" >
-      <description>Error Status of all Entities</description>
-      <field name="ErrorStatus" start="0" bits="7" format="bitmask"/>
-    </register>
-
   </group>
   
   <!-- ##################################################################### -->