From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Wed, 16 Apr 2014 16:28:56 +0000 (+0200)
Subject: nxyter register update
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a18cf194a79a67670bdd2bd72c7209708c356fef;p=daqtools.git

nxyter register update
---

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 8e6aafa..7a7dfbb 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -190,7 +190,7 @@
   <!-- ##################################################################### -->
   
   <group name="DataReceiver"
-         address="0500"  size="20"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="22"  purpose="status"  mode="rw"  continuous="true">
     <register name="ErrorBits" address="0000" purpose="status" mode="r">
       <description>Status of Error Bits</description>
       <field name="NX_Offline"     start="0" bits="1" format="bitmask" purpose="status" mode="r"/>    
@@ -224,22 +224,22 @@
       <description>ADC Data Frame Rate, 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="ADCFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
-
-    <register name="ResetCounter" address="0005" purpose="status" mode="r">
+    
+    <register name="ParityErrRate" address="0005" purpose="status" mode="r">
+      <description>Parity Error Rate, must be 0, &amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
+      <field name="ParityErrRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
+    
+    <register name="ResetCounter" address="0006" purpose="status" mode="r">
       <description>Reset Handler Counter</description>
       <field name="ResetCounter" start="0" bits="16" format="unsigned" />
     </register>
 
-    <register name="ADCResetCtr" address="0006" purpose="status" mode="r">
+    <register name="ADCResetCtr" address="0007" purpose="status" mode="r">
       <description>ADC Reset counter</description>
       <field name="ADCResetCtr" start="0" bits="32" format="unsigned"/>
     </register>
-
-    <register name="ParityErrRate" address="0007" purpose="status" mode="r">
-      <description>Parity Error Rate, must be 0, &amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
-      <field name="ParityErrRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
-    </register>
-    
+   
     <register name="ADCNotLockCounter" address="0008" purpose="status" mode="r">
       <description>ADC Handler not Lock Counter</description>
       <field name="ADCNotLockCounter" start="0" bits="8" format="unsigned" />
@@ -282,7 +282,8 @@
     
     <register name="TSDelay" address="0010" purpose="config" mode="rw">
       <description>Delay of Timestamp Fifo</description>
-      <field name="TSDelay" start="0" bits="4" format="unsigned" />
+      <field name="TSDelayB" start="0" bits="4" format="unsigned" />
+      <field name="TSDelayF" start="4" bits="2" format="unsigned" purpose="status" mode="r"/>
     </register>
 
     <register name="TimestampFifoStatus" address="0011" purpose="status" mode="r">
@@ -296,10 +297,6 @@
         <description>Timestamp Fifo Empty</description>
       </field>  
       
-      <field name="TSFifoAlmostEmpty" start="2" bits="1" format="boolean" mode="r">
-        <description>Timestamp Fifo Almost Empty</description>
-      </field>        
-      
       <field name="NxFrameSynced" start="31" bits="1" format="boolean" mode="r">
         <description>Synchronized to Nxyter Frame</description>
       </field>        
@@ -320,7 +317,17 @@
       <description>Current Timestamp Value read from Fifo</description>
       <field name="CurrentTimestamp" start="0" bits="32" format="unsigned" />
     </register>
-    
+
+    <register name="ADCRateDTError" address="0014" purpose="status" mode="r">
+      <description>ADC Data Rate Error Counter</description>
+      <field name="ADCRateDTError" start="0" bits="11" format="unsigned" />
+    </register>
+
+    <register name="TSRateDTError" address="0015" purpose="status" mode="r">
+      <description>Timestamp Data Rate Error Counter</description>
+      <field name="TSRateDTError" start="0" bits="11" format="unsigned" />
+    </register>
+
   </group>
   
   <!-- ##################################################################### -->