Use width memory attribute, to prevent clash when merging to memoryfield

diff --git a/xml-db/database/Padiwa.xml b/xml-db/database/Padiwa.xml
index 661190a67895187f4be9d655af576b72a5ebbd1f..b8562a525ce9a2290641612d67e97f2290ee73df 100644 (file)
--- a/xml-db/database/Padiwa.xml
+++ b/xml-db/database/Padiwa.xml
@@ -17,7 +17,7 @@
   -->
 
   <group name="Status" purpose="status" address="0100" mode="r">
-    <memory name="UniqueID" address="0000" size="4" bits="16">
+    <memory name="UniqueID" address="0000" size="4" width="16">
       <description>Read the unique identifier of the onboard temperature sensor</description> 
       <field name="UniqueID" start="0" bits="64" format="hex" />
     </memory>

diff --git a/xml-db/schema/TrbNetCommon.xsd b/xml-db/schema/TrbNetCommon.xsd
index 5c9726efb0bc12f8a762e01518ecc9b14accd6e2..31f209f3e695e487fffe45cabb60ce64ac4f6b31 100644 (file)
--- a/xml-db/schema/TrbNetCommon.xsd
+++ b/xml-db/schema/TrbNetCommon.xsd
@@ -83,6 +83,7 @@
   <xs:attribute name="start"        type="bittype" />
   <xs:attribute name="size"         type="xs:positiveInteger" />
   <xs:attribute name="bits"         type="xs:positiveInteger" />
+  <xs:attribute name="width"        type="xs:positiveInteger" />
   <xs:attribute name="defaultValue" type="xs:string" />
   <xs:attribute name="value"        type="valuetype" />
   <xs:attribute name="format"       type="formattype" />
@@ -248,10 +249,10 @@
     <xs:complexType>
       <xs:complexContent>
         <xs:extension base="basicTrbData">
-          <!-- size specified in "bits" long words -->
+          <!-- size specified in "@width" long words -->
           <xs:attribute ref="size" use="required" />
-          <!-- bits is by default assumed to be 32 -->
-          <xs:attribute ref="bits" />
+          <!-- width (in bits) is by default assumed to be 32 -->
+          <xs:attribute ref="width" />
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>