From: Jan Michel <j.michel@gsi.de>
Date: Thu, 27 Jun 2013 13:06:44 +0000 (+0200)
Subject: added further specs for values
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e9f35e1a0879f736d53113401967e8462f173eef;p=daqtools.git

added further specs for values
---

diff --git a/xml-db/database/TrbNetspec.xsd b/xml-db/database/TrbNetspec.xsd
index 0c2b23d..c0420ad 100644
--- a/xml-db/database/TrbNetspec.xsd
+++ b/xml-db/database/TrbNetspec.xsd
@@ -14,20 +14,53 @@
   </xs:restriction>
 </xs:simpleType> 
 
+<xs:simpleType name="modetype">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="[rwb]+"/>
+    <!-- (r)ead and /or (w)rite, plus maybe (b)lock, if a no-more-data from this registers transports some vital information-->
+  </xs:restriction>
+</xs:simpleType> 
+
+<xs:simpleType name="functiontype">
+ <xs:restriction base="xs:string">
+      <xs:enumeration value="config"/>
+      <xs:enumeration value="trigger"/>
+      <xs:enumeration value="status"/>
+      <xs:enumeration value="statistics"/>
+    </xs:restriction>
+</xs:simpleType> 
+
+<xs:simpleType name="bittype">
+  <xs:restriction base="xs:integer">
+    <xs:minInclusive value="0"/>
+    <xs:maxInclusive value="31"/>
+  </xs:restriction>
+</xs:simpleType> 
+
+<xs:simpleType name="formattype">
+ <xs:restriction base="xs:string">
+      <xs:enumeration value="signed"/>
+      <xs:enumeration value="unsigned"/>
+      <xs:enumeration value="hex"/>
+      <xs:enumeration value="bitmask"/>
+      <xs:enumeration value="time"/>
+      <xs:enumeration value="string"/>
+    </xs:restriction>
+</xs:simpleType> 
 
 
 <xs:element name="description" type="xs:string" />
 <xs:attribute name="name"         type="xs:string" />
 <xs:attribute name="address"      type="addresstype" />
 <xs:attribute name="offset"       type="addresstype" />
-<xs:attribute name="mode"         type="xs:string"  />
-<xs:attribute name="type"         type="xs:string" />
-<xs:attribute name="function"     type="xs:string" />
-<xs:attribute name="start"        type="xs:positiveInteger" />
+<xs:attribute name="mode"         type="modetype"  />
+<xs:attribute name="type"         type="functiontype" />
+<xs:attribute name="function"     type="functiontype" />
+<xs:attribute name="start"        type="bittype" />
 <xs:attribute name="size"         type="xs:positiveInteger" />
 <xs:attribute name="defaultValue" type="valuetype" />
 <xs:attribute name="value"        type="valuetype" />
-<xs:attribute name="format"       type="xs:string" />
+<xs:attribute name="format"       type="formattype" />
 <xs:attribute name="continuous"   type="xs:boolean" />
 
 
@@ -40,7 +73,7 @@
       <xs:element   ref="memory"      maxOccurs="unbounded" />
       <xs:element   ref="fifo"        maxOccurs="unbounded" />
     </xs:choice>
-    <xs:attribute ref="type" />
+    <xs:attribute ref="name" />
     <xs:attribute ref="offset" />
   </xs:complexType>
 </xs:element>
@@ -57,7 +90,7 @@
     <xs:attribute ref="name" use="required" />
     <xs:attribute ref="address" />
     <xs:attribute ref="size" />
-    <xs:attribute ref="type" />
+    <xs:attribute ref="function" />
     <xs:attribute ref="continuous" />
     <xs:attribute ref="defaultValue" />
     <xs:attribute ref="format" />
diff --git a/xml-db/database/jtag_registers_SPEC.xml b/xml-db/database/jtag_registers_SPEC.xml
index 1b5822c..64f46d3 100644
--- a/xml-db/database/jtag_registers_SPEC.xml
+++ b/xml-db/database/jtag_registers_SPEC.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <TrbNet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:noNamespaceSchemaLocation="spec.xsd"
-  type="JtagController"
+  name="JtagController"
   offset="1000"
   >
 
@@ -9,13 +9,13 @@ xsi:noNamespaceSchemaLocation="spec.xsd"
   name="TriggerAllchainsInitSeq"
   address="0003"
   mode="w"
-  function ="configuration"
+  function ="config"
   >
   <description>
 Start initialization sequence for all connected sensor chains    
   </description>
 <field
-  type="configuration"
+  type="config"
   name="NU"
   start="16"
   size="4"