From: Daniel Martin <consume.noise@gmail.com>
Date: Fri, 22 Nov 2013 22:26:54 +0000 (+0100)
Subject: schema: Restricted enum item values
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a66356e0d97e18f567a1fcc14e037fa190916463;p=free-sw%2Fxcb%2Fproto

schema: Restricted enum item values

Restrict decimal values by using an xsd:unsignedInt instead of an
xsd:integer. xsd:unsignedInt is an unsigned 32-bit integer.
And restrict bit values by adding a type, which allows values within the
range of [0, 32) only.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
---

diff --git a/src/xcb.xsd b/src/xcb.xsd
index 77a696f..59bb9a8 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -163,7 +163,7 @@ authorization from the authors.
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="value" type="xsd:integer" />
-      <xsd:element name="bit" type="xsd:integer" />
+      <xsd:element name="bit" type="bitType" />
     </xsd:choice>
   </xsd:group>
   
@@ -224,6 +224,14 @@ authorization from the authors.
     <xsd:attribute name="ref" type="xsd:string" use="required" />
   </xsd:complexType>
 
+  <!-- Type for bit values -->
+  <xsd:simpleType name="bitType">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0" />
+      <xsd:maxExclusive value="32" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
   <!-- Type for documentation -->
   <xsd:group name="doc-fields">
     <xsd:sequence>
@@ -352,8 +360,8 @@ authorization from the authors.
             <xsd:element name="item">
               <xsd:complexType>
                 <xsd:choice minOccurs="1" maxOccurs="1">
-                  <xsd:element name="value" type="xsd:integer" />
-                  <xsd:element name="bit" type="xsd:integer" />
+                  <xsd:element name="value" type="xsd:unsignedInt" />
+                  <xsd:element name="bit" type="bitType" />
                 </xsd:choice>
                 <xsd:attribute name="name" type="xsd:string" use="required" />
               </xsd:complexType>