update xml database

diff --git a/xml-db/database/Mimosis.xml b/xml-db/database/Mimosis.xml
index 9c27007720cfa53926c59e88852157bf56f95b7d..eee4ff221e08a2c0896233e8928bfd0622b2b5d8 100644 (file)
--- a/xml-db/database/Mimosis.xml
+++ b/xml-db/database/Mimosis.xml
@@ -6,6 +6,77 @@
               >
   <description>Registers for the Mimosis Readout</description>
 
+<group name="InputStage" address="0000"  size="32"  purpose="status" mode="rw" continuous="false">
+   <register name="InputControl" address="0010" >
+      <description>Control of input stage</description>
+      <field name="InputReset" start="0" bits="1" format="boolean"  errorflag="true" >
+        <description>Reset bit alignment procedure</description>
+      </field>
+      <field name="InputLoadn" start="16" bits="8" format="bitmask"  errorflag="true" >
+        <description>Reset input delays</description>
+      </field>
+    </register>
+
+   <register name="InputStatus" address="0000" repeat="8" continuous="true" mode="r">
+      <description>Input bit alignment info</description>
+      <field name="SampleGood" start="0" bits="7" format="unsigned" >
+        <description>Number of good positions of delay setting</description>
+      </field>
+      <field name="SampleBad" start="8" bits="7" format="unsigned" >
+        <description>Number of bad positions of delay setting</description>
+      </field>
+      <field name="DelayFinished" start="20" bits="1" format="bitmask" >
+        <description>Delay search procedure is finished</description>
+      </field>
+      <field name="DelayPosition" start="24" bits="7" format="unsigned" >
+        <description>Selected delay position</description>
+      </field>
+    </register>    
+   <register name="InputStatus2" address="0008" repeat="8" continuous="true" mode="r">
+      <description>Input bit alignment info</description>
+      <field name="FirstGood" start="0" bits="7" format="unsigned" >
+        <description>Position of first good sample</description>
+      </field>
+      <field name="LastGood" start="8" bits="7" format="unsigned" >
+        <description>Position of last good sample</description>
+      </field>
+      <field name="FirstBad" start="16" bits="7" format="unsigned" >
+        <description>Position of first bad sample</description>
+      </field>
+      <field name="LastBad" start="24" bits="7" format="unsigned" >
+        <description>Position of last bad sample</description>
+      </field>
+    </register>
+    </group>
+    
+<group name="WordAlignStage" address="0100"  size="32"  purpose="status" mode="r" continuous="false">
+      <register name="AlignControl" address="0000" >
+        <description>Control Register for Word Alignment stage</description>
+<!--        <field name="InputEnable" start="0" bits="8" format="bitmask"   >
+          <description>Enable individual lines</description>
+        </field>        -->
+      <field name="AlignFixed" start="8" bits="1" format="bitmask"  mode="rw">
+        <description>Position of alignment fixed</description>
+      </field>        
+      <field name="WriteAll" start="9" bits="1" format="bitmask" errorflag="true" mode="rw">
+        <description>Write all words, don't strip IDLE</description>
+      </field>        
+      <field name="IgnoreActive" start="10" bits="1" format="bitmask" errorflag="true" mode="rw">
+        <description>Ignore 'active' flag from input stage</description>
+      </field> 
+      </register>
+    <register name="WordStatus" address="0010" repeat="8">
+      <description>Word Alignment Status</description>
+      <field name="LastWord" start="0" bits="16" format="hex"  noflag="true">
+        <description>Last received word</description>
+      </field>
+      <field name="FoundIdle" start="24" bits="1" format="boolean" >
+        <description>Found idle word</description>
+      </field>
+      
+    </register>
+</group>    
+    
 
   <group name="FrameBuffer" address="0200"  size="16"  purpose="status" mode="r" continuous="true">
     <register name="CounterHeader" address="0000" >
@@ -61,4 +132,78 @@
     
   </group>
 
+  
+  <group name="MimosisI2C" address="3e00"  size="6"  purpose="status" mode="rw" continuous="true">
+    <register name="MimosisI2C0" address="0000" >
+      <description>First I2C register</description>
+      <field name="Speed" start="0" bits="6" format="unsigned"  noflag="true" >
+        <description>Multiples of 8 System clock cycles for 1/2 I2C clock</description>
+      </field>    
+    </register>
+    
+    <register name="MimosisI2C1" address="0001" >
+      <description>Second I2C register</description>
+      <field name="WordByte" start="0" bits="1" format="bitmask" noflag="true" >
+        <description>Select to send one byte (0) or one word (1)</description>
+      </field>    
+      <field name="ReadWrite" start="8" bits="1" format="bitmask" noflag="true" >
+        <description>Select to write (0) or read (1)</description>
+      </field>    
+    </register>
+    
+    <register name="MimosisI2C2" address="0002" >
+      <description>Third I2C register / Command and data</description>
+      <field name="I2CAddress" start="0" bits="8" format="hex" noflag="true" >
+        <description>I2C address byte, r/w bit is ignored</description>
+      </field>    
+      <field name="I2CCommand" start="8" bits="8" format="hex" noflag="true" >
+        <description>Command byte, sent after address</description>
+      </field>    
+      <field name="I2CData" start="16" bits="16" format="hex" noflag="true" >
+        <description>Data word, sent after command</description>
+      </field>    
+    </register>    
+    <register name="MimosisI2CTrigger" address="0003" >
+      <description>Trigger I2C action</description>
+        <field name="I2CExecute" start="0" bits="1" format="bitmask"  />
+    </register>  
+    
+    <register name="MimosisI2C4" address="0004" mode="r">
+      <description>Fourth I2C register / Status and read-back</description>
+      <field name="I2CDataRead" start="0" bits="16" format="hex" noflag="true" >
+        <description>Data word read back</description>
+      </field> 
+      <field name="I2CStatus" start="16" bits="8" format="hex" noflag="true" >
+        <description>Status flags of I2C master</description>
+      </field>    
+      <field name="I2CFsmState" start="24" bits="5" format="hex" noflag="true" >
+        <description>Status of I2C state machine</description>
+      </field>        
+      <field name="I2CDone" start="29" bits="1" format="boolean"  >
+        <description>Operation finished</description>
+      </field>    
+      <field name="I2CBusy" start="30" bits="1" format="boolean"  errorflag="true">
+        <description>I2C master busy</description>
+      </field>    
+      <field name="I2CValid" start="31" bits="1" format="boolean"  >
+        <description>Data valid</description>
+      </field>    
+    </register>    
+
+    
+    <register name="MimosisControl" address="0005" mode="rw">
+      <description>Mimosis Control Pins</description>
+        <field name="MimosisSync" start="0" bits="1" format="boolean"  >
+          <description> Mimosis SYNC input</description>
+        </field>  
+        <field name="MimosisStart" start="4" bits="1" format="boolean"  >
+          <description> Mimosis START input</description>
+        </field>  
+        <field name="MimosisReset" start="8" bits="1" format="boolean"  >
+          <description> Mimosis RESET input</description>
+        </field>  
+    </register>      
+    
+  </group>
+  
 </TrbNetEntity>  

diff --git a/xml-db/database/TrbNet.xml b/xml-db/database/TrbNet.xml
index 08662823ce1102fd89f96794ee55130e78765ff7..02383865976b552e99e6f4213685a57abcdc3de6 100644 (file)
--- a/xml-db/database/TrbNet.xml
+++ b/xml-db/database/TrbNet.xml
@@ -163,6 +163,20 @@
         <description>Default address after reload</description>
       </field>
     </register>
+    
+    <register name="Addresses2" address="6FC1" purpose="status" mode="rw">
+      <description>Address setting registers </description>
+      <field name="SetAddress" start="0" bits="16" format="hex" >
+        <description>Set main board address. Bit 31 must be assigned to update the board address with this value</description>
+      </field>
+      <field name="CustomBroadcast" start="16" bits="8"  scaleoffset="64768" format="hex" >
+        <description>Configurable broadcast using 0xFD__ </description>
+      </field>
+      <field name="SetAddressEnable" start="31" bits="1" format="boolean" >
+        <description>Update Address enable bit. </description>
+      </field>
+    </register>
+    
   </group>
 
 </TrbNetEntity>