From: Andreas Neiser <neiser@kph.uni-mainz.de>
Date: Sat, 29 Jun 2013 09:52:36 +0000 (+0200)
Subject: Renaming TrbNet to TrbNetEntity, since TrbNet consists of endpoints, whose registers... 
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8f6a8dcd651b09aca752e649c60f111447322f08;p=daqtools.git

Renaming TrbNet to TrbNetEntity, since TrbNet consists of endpoints, whose registers/memory/fifos are described by one or more TrbNetEntities
---

diff --git a/xml-db/database/TDC.xml b/xml-db/database/TDC.xml
index 51fde5c..2778e52 100644
--- a/xml-db/database/TDC.xml
+++ b/xml-db/database/TDC.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<TrbNet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="TrbNet.xsd"
-        name="JtagController"
-        address="a000"
+<TrbNetEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="TrbNetEntity.xsd"
+        name="TDC"
+        address="c000"
         >
   <!--===========================================-->
   <!-- Common TDC control registers             -->
   <!--===========================================-->
-  <group name="JtagCommonControl"
+  <group name="Control"
          address="1000"  size="37"  function="config"  mode="rw"  continuous="true">
     <register name="WaitBeforeStart"
               address="0007" mode="rw" function ="config" >
@@ -203,5 +203,5 @@
       </register>
     </group>
   </group>
-</TrbNet>
+</TrbNetEntity>
 
diff --git a/xml-db/database/TrbNet.xsd b/xml-db/database/TrbNetEntity.xsd
similarity index 99%
rename from xml-db/database/TrbNet.xsd
rename to xml-db/database/TrbNetEntity.xsd
index d634573..a23d35d 100644
--- a/xml-db/database/TrbNet.xsd
+++ b/xml-db/database/TrbNetEntity.xsd
@@ -96,7 +96,7 @@
   <!--==============================
       Complex Elements
       ==============================-->
-  <xs:element name="TrbNet">
+  <xs:element name="TrbNetEntity">
     <xs:complexType>
       <xs:choice maxOccurs="unbounded">
         <xs:element   ref="description" minOccurs="1" maxOccurs="1" />
diff --git a/xml-db/database/jtag_registers_SPEC.xml b/xml-db/database/jtag_registers_SPEC.xml
index c32b8f5..9ea9710 100644
--- a/xml-db/database/jtag_registers_SPEC.xml
+++ b/xml-db/database/jtag_registers_SPEC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<TrbNet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="TrbNet.xsd"
+<TrbNetEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="TrbNetEntity.xsd"
         name="JtagController"
         address="a000"
         >
@@ -203,5 +203,5 @@
       </register>
     </group>
   </group>
-</TrbNet>
+</TrbNetEntity>
 
diff --git a/xml-db/database/testing.xml b/xml-db/database/testing.xml
index 1ab8a24..b7bec3f 100644
--- a/xml-db/database/testing.xml
+++ b/xml-db/database/testing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"  encoding="utf-8" ?>
-<TrbNet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="TrbNet.xsd"
+<TrbNetEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="TrbNetEntity.xsd"
         name="JtagController"
         address="1000"
         >
@@ -29,4 +29,4 @@
       </field>
     </register>
   </group>
-</TrbNet>
+</TrbNetEntity>