Add new registers to xml-db: additional reg, reboot on reset

diff --git a/web/htdocs/network/trbnet.pl b/web/htdocs/network/trbnet.pl
index 50c693815b436a6a46ddb56e0d5937a292116b31..86afc05a37ea9d2522d8e24148c723dd600c7460 100755 (executable)
--- a/web/htdocs/network/trbnet.pl
+++ b/web/htdocs/network/trbnet.pl
@@ -27,21 +27,22 @@ $setup[0]->{name}    = "StatusRegisters";
 $setup[0]->{cmd}     = "TrbNet-0xffff-StatusRegisters";
 $setup[0]->{period}  = 2000;
 
-$setup[1]->{name}    = "BoardInfo";
-$setup[1]->{cmd}     = "TrbNet-0xffff-BoardInformation";
+$setup[1]->{name}    = "CommonRegs";
+$setup[1]->{cmd}     = "TrbNet-0xffff-CommonRegs";
 $setup[1]->{period}  = -1;
 
-$setup[2]->{name}    = "Readout";
-$setup[2]->{cmd}     = "Readout-0xffff-Status";
+$setup[2]->{name}    = "BoardInfo";
+$setup[2]->{cmd}     = "TrbNet-0xffff-BoardInformation";
 $setup[2]->{period}  = -1;
 
+$setup[3]->{name}    = "Readout";
+$setup[3]->{cmd}     = "Readout-0xffff-Status";
+$setup[3]->{period}  = -1;
 
 
-xmlpage::initPage(\@setup,$page);
- 
 
+xmlpage::initPage(\@setup,$page);
  
-
 1;
 
 

diff --git a/xml-db/database/TrbNet.xml b/xml-db/database/TrbNet.xml
index 02383865976b552e99e6f4213685a57abcdc3de6..ac4fcc6c4c17f8abc7b1f4feb52c9c400c68b2e5 100644 (file)
--- a/xml-db/database/TrbNet.xml
+++ b/xml-db/database/TrbNet.xml
@@ -135,7 +135,34 @@
     
   </group>
 
-
+  <group name="CommonRegs" address="0000" mode="rw"  purpose="config" continuous="false">
+    <register name="AdditionalReg" address="d580" >
+      <description>Design dependend function, e.g. LED off</description>
+      <field name="AdditionalReg" start="0" bits="32" format="bitmask" />
+    </register>    
+    <register name="ControlReg" address="d581" >
+      <description>New common function register</description>
+      <field name="ControlRegFull" start="0" bits="32" format="bitmask" >
+        <description>Full control reg</description>
+      </field>  
+      <field name="RebootOnReset" start="15" bits="1" format="boolean" >
+        <description>Board makes a full reload with next reset</description>
+      </field>  
+    </register>
+    
+    <register name="Addresses2" address="7001" 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>  
 
   <group name="BoardInformation" address="0040" mode="r" >
     <register name="CompileTime" address="0000" purpose="status">
@@ -163,20 +190,8 @@
         <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>