added missing JTAG registers

diff --git a/xml-db/database/TrbNet.xsd b/xml-db/database/TrbNet.xsd
index d96b5ba61577b2521938c5d99c31536a05587fff..7f54e2ffff402fd0cafe82cbab11f2ccaf32556d 100644 (file)
--- a/xml-db/database/TrbNet.xsd
+++ b/xml-db/database/TrbNet.xsd
@@ -41,10 +41,12 @@
 
 <xs:simpleType name="formattype">
  <xs:restriction base="xs:string">
+    <xs:enumeration value="integer"/>
     <xs:enumeration value="signed"/>
     <xs:enumeration value="unsigned"/>
     <xs:enumeration value="hex"/>
     <xs:enumeration value="bitmask"/>
+    <xs:enumeration value="boolean"/>
     <xs:enumeration value="time"/>
     <xs:enumeration value="string"/>
   </xs:restriction>
@@ -79,7 +81,7 @@
 <xs:element name="TrbNet">
   <xs:complexType>
     <xs:choice maxOccurs="unbounded">
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
       <xs:element   ref="group"       maxOccurs="unbounded" />
       <xs:element   ref="register"    maxOccurs="unbounded" />
       <xs:element   ref="memory"      maxOccurs="unbounded" />
@@ -94,7 +96,7 @@
   <xs:complexType>
     <xs:choice maxOccurs="unbounded">
       <xs:element   ref="group"       maxOccurs="unbounded" />
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
       <xs:element   ref="register"    maxOccurs="unbounded" />
       <xs:element   ref="memory"      maxOccurs="unbounded" />
       <xs:element   ref="fifo"        maxOccurs="unbounded" />
@@ -113,12 +115,13 @@
 <xs:element name="field">
   <xs:complexType>
     <xs:all>
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
     </xs:all>
     <xs:attribute ref="name" />
     <xs:attribute ref="start" />
     <xs:attribute ref="size" />
     <xs:attribute ref="type" />
+    <xs:attribute ref="mode" />
     <xs:attribute ref="defaultValue" />
     <xs:attribute ref="format" />
   </xs:complexType>
@@ -129,7 +132,7 @@
   <xs:complexType>
     <xs:choice maxOccurs="unbounded">
       <xs:element   ref="field" />
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
     </xs:choice>
     <xs:attribute ref="name" />
     <xs:attribute ref="address" />
@@ -142,7 +145,7 @@
   <xs:complexType>
     <xs:choice maxOccurs="unbounded">
       <xs:element   ref="field" />
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
     </xs:choice>
     <xs:attribute ref="name" />
     <xs:attribute ref="address" />
@@ -156,7 +159,7 @@
   <xs:complexType>
     <xs:choice maxOccurs="unbounded">
       <xs:element   ref="field" />
-      <xs:element   ref="description" maxOccurs="1" />
+      <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
     </xs:choice>
     <xs:attribute ref="name" />
     <xs:attribute ref="address" />

diff --git a/xml-db/database/jtag_registers_SPEC.xml b/xml-db/database/jtag_registers_SPEC.xml
index dc77ba79050a2202ce6fc1b9b47f2616544aa073..4f8b3cb8a290aea4f76220b743d29be8448972ab 100644 (file)
--- a/xml-db/database/jtag_registers_SPEC.xml
+++ b/xml-db/database/jtag_registers_SPEC.xml
@@ -11,10 +11,75 @@ xsi:noNamespaceSchemaLocation="TrbNet.xsd"
             address="0007" mode="rw" function ="config" >
     <description>Wait time between write sequence and start signal.</description>
     <field name="WaitBeforeStart"
-           start="0"   size="20"  type="config"    defaultValue="0" >
+           start="0"   size="20"  mode="rw"  type="config"  format="integer"  defaultValue="0" >
       <description>The number of MAPS clock cycles to wait after last write before sending the start signal. </description>
     </field>
   </register>
+  
+  <register name="TriggerInitSeq"
+            address="000c" mode="w" function ="trigger" >
+    <description>Trigger the init sequence.</description>
+    <field name="TriggerInitSeq"
+           start="0"   size="5"  mode="w"  type="trigger"  format="bitmask"  defaultValue="0" >
+      <description>A bitmask to trigger the init sequence on individual JTAG chains. </description>
+    </field>
+  </register>
+
+  <register name="TriggerReset"
+            address="000d" mode="w" function ="trigger" >
+    <description>Trigger the init sequence.</description>
+    <field name="TriggerReset"
+           start="0"   size="5"  mode="w"  type="trigger"  format="bitmask"  defaultValue="0" >
+      <description>A bitmask to trigger sending a reset pulse on individual JTAG chains </description>
+    </field>
+  </register>
+
+  <register name="TriggerStart"
+            address="000e" mode="w" function ="trigger" >
+    <description>Trigger sending a start pulse.</description>
+    <field name="TriggerStart"
+           start="0"   size="5"  mode="w"  type="trigger"  format="bitmask"  defaultValue="0" >
+      <description>A bitmask to trigger sending a start pulse on individual JTAG chains </description>
+    </field>
+  </register>
+
+  <register name="TriggerJtagRun"
+            address="000f" mode="w" function ="trigger" >
+    <description>Trigger running JTAG write.</description>
+    <field name="TriggerJtagRun"
+           start="0"   size="5"  mode="w"  type="trigger"  format="bitmask"  defaultValue="0" >
+      <description>A bitmask to trigger writing the JTAG registers three times on individual JTAG chains </description>
+    </field>
+  </register>
+
+  <register name="ResetBeforeInit"
+            address="0010" mode="rw" function ="config" >
+    <description>Generate a reset before doing init sequence</description>
+    <field name="ResetBeforeInit"
+           start="0"   size="1"  mode="rw"  type="config"  format="boolean"  defaultValue="0" >
+      <description>Enable to send a reset pulse before starting init sequence</description>
+    </field>
+  </register>
+
+  <register name="ResetAfterFirstWrite"
+            address="0011" mode="rw" function ="config" >
+    <description>Generate a reset after first register write sequence</description>
+    <field name="ResetAfterFirstWrite"
+           start="0"   size="1"  mode="rw"  type="config"  format="boolean"  defaultValue="0" >
+      <description>Enable to send a reset pulse after the first writing of JTAG registers</description>
+    </field>
+  </register>
+
+  <register name="TriggerWriteOnce"
+            address="0014" mode="w" function ="trigger" >
+    <description>Trigger writing all JTAG registers once</description>
+    <field name="TriggerWriteOnce"
+           start="0"   size="5"  mode="w"  type="trigger"  format="bitmask"  defaultValue="0" >
+      <description>Trigger writing all JTAG registers once on individual JTAG chains</description>
+    </field>
+  </register>
+
+
 </group>
 
 </TrbNet>
\ No newline at end of file