made 'bit' required for fields

diff --git a/xml-db/database/JtagController.xml b/xml-db/database/JtagController.xml
index edf0504bf2ecf72358c9c0f4cbe3a2620a6a6bb6..8f32ba01433e70ff4bb3d4e9d30453ff61d34cca 100644 (file)
--- a/xml-db/database/JtagController.xml
+++ b/xml-db/database/JtagController.xml
@@ -54,7 +54,7 @@
               address="0010" mode="rw" purpose="config" >
       <description>Generate a reset before doing init sequence</description>
       <field name="ResetBeforeInit"
-             start="0" mode="rw"  purpose="config"  format="boolean">
+             start="0" bits="1" mode="rw"  purpose="config"  format="boolean">
         <description>Enable to send a reset pulse before starting init sequence</description>
       </field>
     </register>
@@ -62,7 +62,7 @@
               address="0011" mode="rw" purpose="config" >
       <description>Generate a reset after first register write sequence</description>
       <field name="ResetAfterFirstWrite"
-             start="0" mode="rw"  purpose="config"  format="boolean">
+             start="0" bits="1" mode="rw"  purpose="config"  format="boolean">
         <description>Enable to send a reset pulse after the first writing of JTAG registers</description>
       </field>
     </register>
@@ -81,59 +81,59 @@
                 address="0000"  repeat="5" >
         <description>Sets fixed values for all outputs for JTAG and sensor control and inverts the outputs if needed. One register for each JTAG chain.</description>
         <field name="InvertTDO"
-               start="0"  format="boolean">
+               start="0" bits="1" format="boolean">
           <description>Invert TDO input signal</description>
         </field>      
         <field name="InvertTDI"
-               start="2"  format="boolean">
+               start="2" bits="1"  format="boolean">
           <description>Invert TDI output signal</description>
         </field>
         <field name="InvertTMS"
-               start="4"  format="boolean">
+               start="4" bits="1"  format="boolean">
           <description>Invert TMS output signal</description>
         </field>
         <field name="InvertTCK"
-               start="6"  format="boolean">
+               start="6" bits="1"  format="boolean">
           <description>Invert TCK output signal</description>
         </field>
         <field name="InvertStart"
-               start="8"  format="boolean">
+               start="8" bits="1"  format="boolean">
           <description>Invert Start output signal</description>
         </field>
         <field name="InvertReset"
-               start="10" format="boolean">
+               start="10" bits="1" format="boolean">
           <description>Invert Reset output signal</description>
         </field>
         <field name="InvertClock"
-               start="12"  format="boolean">
+               start="12" bits="1"  format="boolean">
           <description>Invert Clock output signal</description>
         </field>
         <field name="EnableTDO"
-               start="1" format="boolean">
+               start="1" bits="1" format="boolean">
           <description>Enable TDO input signal</description>
         </field>      
         <field name="EnableTDI"
-               start="3"  format="boolean">
+               start="3" bits="1"  format="boolean">
           <description>Enable TDI output signal</description>
         </field>
         <field name="EnableTMS"
-               start="5"  format="boolean">
+               start="5" bits="1"  format="boolean">
           <description>Enable TMS output signal</description>
         </field>
         <field name="EnableTCK"
-               start="7"  format="boolean">
+               start="7" bits="1"  format="boolean">
           <description>Enable TCK output signal</description>
         </field>
         <field name="EnableStart"
-               start="9"  format="boolean">
+               start="9" bits="1"  format="boolean">
           <description>Enable Start output signal</description>
         </field>
         <field name="EnableReset"
-               start="11" format="boolean">
+               start="11" bits="1" format="boolean">
           <description>Enable Reset output signal</description>
         </field>
         <field name="EnableClock"
-               start="13" format="boolean">
+               start="13" bits="1" format="boolean">
           <description>Enable Clock output signal</description>
         </field>
       </register>
@@ -181,27 +181,27 @@
                 address="0005" purpose="status" mode="r" >
         <description>Status flags of the JTAG chain</description>
         <field name="JtagStarted"
-               start="0"  mode="r"  purpose="status"  format="boolean" >
+               start="0" bits="1"  mode="r"  purpose="status"  format="boolean" >
           <description>JTAG has been started</description>
         </field>
         <field name="JtagLastSuccesful"
-               start="4"  mode="r"  purpose="status"  format="boolean" >
+               start="4" bits="1"  mode="r"  purpose="status"  format="boolean" >
           <description>Last JTAG run was successful</description>
         </field>
         <field name="JtagLastDataChanged"
-               start="8"  mode="r"  purpose="status"  format="boolean" >
+               start="8" bits="1"  mode="r"  purpose="status"  format="boolean" >
           <description>Data in the sensor was corrupted at last JTAG run</description>
         </field>
         <field name="JtagLastWriteError"
-               start="12" mode="r"  purpose="status"  format="boolean" >
+               start="12" bits="1" mode="r"  purpose="status"  format="boolean" >
           <description>Last run had a JTAG write error</description>
         </field>
         <field name="JtagLastReadError"
-               start="16" mode="r"  purpose="status"  format="boolean" >
+               start="16" bits="1" mode="r"  purpose="status"  format="boolean" >
           <description>Last run had a JTAG read error</description>
         </field>
         <field name="JtagCrcError"
-               start="20" mode="r"  purpose="status"  format="boolean" >
+               start="20" bits="1" mode="r"  purpose="status"  format="boolean" >
           <description>Last run had a JTAG CRC error</description>
         </field>
       </register>

diff --git a/xml-db/database/TDC.xml b/xml-db/database/TDC.xml
index 5700f8a6349892d123019c869fe06cbec83e0947..6ffe0a6f061199296523a9f8faf49e2b5112e40c 100644 (file)
--- a/xml-db/database/TDC.xml
+++ b/xml-db/database/TDC.xml
@@ -52,11 +52,11 @@
       <field name="ChannelCount" start="8" bits="8" format="unsigned">
         <description>Number of implemented channels</description>
       </field>
-      <field name="RefTimeSyncedTo100" start="16" format="boolean">
+      <field name="RefTimeSyncedTo100" start="16" bits="1" format="boolean">
         <description>Reference time synchronised to 100 MHz Trb-Net
         clock</description>
       </field>
-      <field name="TriggerType" start="28" bits="4" format="boolean" mode="rw" purpose="config">
+      <field name="TriggerType" start="28" bits="4" format="hex" mode="rw" purpose="status">
         <description>Trigger type</description>
       </field>
     </register>
@@ -77,7 +77,7 @@
         <description>Trigger window width AFTER the trigger with
         granularity of 5 ns</description>
       </field>
-      <field name="TriggerWindowEnabled" start="31" format="boolean">
+      <field name="TriggerWindowEnabled" start="31" bits="1" format="boolean">
         <description>Trigger window enabled?</description>
       </field>
     </register>
@@ -182,11 +182,11 @@
         <description>Enables different signals to the HPLA* output for
         debugging with logic analyser</description>
       </field>
-      <field name="DebugMode" start="4" format="boolean">
+      <field name="DebugMode" start="4" bits="1" format="boolean">
         <description>Enables the Debug Mode. Different statistics and
         debug words are sent after every trigger</description>
       </field>
-      <field name="ResetCounters" start="8" purpose="trigger" mode="w">
+      <field name="ResetCounters" start="8" bits="1" purpose="trigger" mode="w">
         <description>Resets the internal counters</description>
       </field>
       <field name="TriggerMode" start="0" bits="12" format="enum">
@@ -207,7 +207,7 @@
         <description>Trigger window width AFTER the trigger with
         granularity of 5 ns. ATTENTION: Minimum value is x"00f"!</description>
       </field>
-      <field name="TriggerWindowEnable" start="31" format="boolean">
+      <field name="TriggerWindowEnable" start="31" bits="1" format="boolean">
         <description>Trigger window enable</description>
       </field>
     </register>

diff --git a/xml-db/schema/TrbNetCommon.xsd b/xml-db/schema/TrbNetCommon.xsd
index 97ea901536bebe0023a209e38541ccfe2303699a..d776494609015246c6c88a3828272c6813a4d6fb 100644 (file)
--- a/xml-db/schema/TrbNetCommon.xsd
+++ b/xml-db/schema/TrbNetCommon.xsd
@@ -187,7 +187,7 @@
     <!-- "start" (and "address" in basicTrbdata) should usually be
          provided in the database -->
     <xs:attribute ref="start" use="required" />
-    <xs:attribute ref="bits" />
+    <xs:attribute ref="bits" use="required" />
     <xs:attribute ref="purpose" />
     <xs:attribute ref="mode" />
     <!-- if the default value of that field is not 0x0 (in the