Renaming TrbNet to TrbNetEntity, since TrbNet consists of endpoints, whose registers...

diff --git a/xml-db/database/TDC.xml b/xml-db/database/TDC.xml
index 51fde5cd96855ba2229f818bf1f50a47b1e5b9bf..2778e522ec4281fa405471d798956e19ceda7c87 100644 (file)
--- 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 d634573d54c91f522542d4dd398a887c9126f193..a23d35d226dc457c31ea3c1a650ce2189613886d 100644 (file)
--- 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 c32b8f50a9535dc06524c68dadf7f8fbf81e1a71..9ea9710b6da0495abfb0bbbd15bf94466240dc09 100644 (file)
--- 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 1ab8a24818e55c0519298981839ee58473a9f672..b7bec3faa97645e98e13afd8bd62642d84bbd92a 100644 (file)
--- 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>