X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.xsd;h=85f5bc2af7f6cf356790b46faa7c7d7eff7b8e75;hb=691d2b97e5989d6d7006304d81bd8fa128477ca1;hp=5169b4809cbf8372f80081999dac0bc3460f1836;hpb=9d03507afa4354ce402333f94d01f6bcb2cf41e6;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xcb.xsd b/src/xcb.xsd
index 5169b48..85f5bc2 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -42,7 +42,8 @@ authorization from the authors.
   <!-- Padding -->
   <xsd:element name="pad">
     <xsd:complexType>
-      <xsd:attribute name="bytes" type="xsd:integer" use="required" />
+      <xsd:attribute name="bytes" type="xsd:integer" use="optional" />
+      <xsd:attribute name="align" type="xsd:integer" use="optional" />
     </xsd:complexType>
   </xsd:element>
 
@@ -53,19 +54,21 @@ authorization from the authors.
     <xsd:attribute name="enum" type="xsd:string" use="optional" />
     <xsd:attribute name="altenum" type="xsd:string" use="optional" />
     <xsd:attribute name="mask" type="xsd:string" use="optional" />
+    <xsd:attribute name="altmask" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <!-- case expression -->
   <xsd:complexType name="caseexpr">
     <xsd:sequence>
       <!-- case expression: -->
-      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
+      <xsd:group ref="expression" minOccurs="1" maxOccurs="unbounded" />
       <!-- match -->
       <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
       <xsd:choice>
         <xsd:element ref="switch" minOccurs="0" maxOccurs="unbounded" />
       </xsd:choice>
     </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="optional" />
   </xsd:complexType>
 
   <!-- switch expression -->
@@ -75,7 +78,9 @@ authorization from the authors.
       <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
       <xsd:choice>
         <!-- bitcase expression - bit test -->
-        <xsd:element name="bitcase" type="caseexpr" minOccurs="1" maxOccurs="unbounded" />
+        <xsd:element name="bitcase" type="caseexpr" minOccurs="0" maxOccurs="unbounded" />
+        <!-- case expression - value test -->
+        <xsd:element name="case" type="caseexpr" minOccurs="0" maxOccurs="unbounded" />
       </xsd:choice>
       <!-- default: -->
       <xsd:group ref="fields" minOccurs="0" maxOccurs="1" />
@@ -88,6 +93,13 @@ authorization from the authors.
   <!-- field replaces FIELD, PARAM, and REPLY. -->
   <xsd:element name="field" type="var" />
 
+  <!-- fd passing parameter -->
+  <xsd:element name="fd">
+    <xsd:complexType>
+      <xsd:attribute name="name" type="xsd:string" use="required" />
+    </xsd:complexType>
+  </xsd:element>
+
   <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
        are specified as attributes.  The content is an expression giving the
        length. -->
@@ -153,8 +165,8 @@ authorization from the authors.
           <xsd:attribute name="ref" use="required" type="xsd:string" />
         </xsd:complexType>
       </xsd:element>
-      <xsd:element name="value" type="dec-or-hex-integer" />
-      <xsd:element name="bit" type="xsd:integer" />
+      <xsd:element name="value" type="xsd:integer" />
+      <xsd:element name="bit" type="bitType" />
     </xsd:choice>
   </xsd:group>
   
@@ -184,6 +196,7 @@ authorization from the authors.
       <xsd:element ref="pad" />
       <xsd:element ref="field" />
       <xsd:element ref="list" />
+      <xsd:element ref="fd" />
     </xsd:choice>
   </xsd:group>
 
@@ -200,7 +213,9 @@ authorization from the authors.
 
   <!-- Type for a packet structure -->
   <xsd:complexType name="packet-struct">
-    <xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />
+    <xsd:sequence>
+      <xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string" use="required" />
     <xsd:attribute name="number" type="xsd:integer" use="required" />
   </xsd:complexType>
@@ -212,17 +227,66 @@ authorization from the authors.
     <xsd:attribute name="ref" type="xsd:string" use="required" />
   </xsd:complexType>
 
-  <!-- Type for hex integers -->
-  <xsd:simpleType name="hex-integer">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="0x[0-9a-fA-F]+" />
+  <!-- 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 integers in either decimal or hex -->
-  <xsd:simpleType name="dec-or-hex-integer">
-    <xsd:union memberTypes="xsd:integer hex-integer" />
-  </xsd:simpleType>
+  <!-- Type for documentation -->
+  <xsd:group name="doc-fields">
+    <xsd:sequence>
+      <xsd:element name="field">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:group name="error-fields">
+    <xsd:sequence>
+      <xsd:element name="error">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="type" type="xsd:string" />
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:group name="see-fields">
+    <xsd:sequence>
+      <xsd:element name="see">
+        <xsd:complexType>
+          <xsd:attribute name="name" type="xsd:string" />
+          <xsd:attribute name="type" type="xsd:string" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:element name="doc">
+    <xsd:complexType mixed="true">
+      <xsd:sequence>
+        <xsd:element name="brief" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:element name="example" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:group ref="doc-fields" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:group ref="error-fields" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:group ref="see-fields" minOccurs="0" maxOccurs="unbounded" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
 
   <xsd:group name="macro">
     <xsd:choice>
@@ -247,22 +311,29 @@ authorization from the authors.
                   <xsd:choice minOccurs="0" maxOccurs="1">
                     <xsd:element ref="switch" />
                   </xsd:choice>
+                  <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
                 </xsd:sequence>
               </xsd:complexType>
             </xsd:element>
+            <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
           </xsd:sequence>
           <xsd:attribute name="name" type="xsd:string" use="required" />
           <xsd:attribute name="opcode" type="xsd:integer" use="required" />
           <xsd:attribute name="combine-adjacent" type="xsd:boolean"
-                         use="optional"/>
+                         use="optional" default="false" />
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="event">
         <xsd:complexType>
           <xsd:complexContent>
             <xsd:extension base="packet-struct">
+              <xsd:sequence>
+                <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
+              </xsd:sequence>
               <xsd:attribute name="no-sequence-number" type="xsd:boolean"
-                             use="optional" />
+                             use="optional" default="false" />
+              <xsd:attribute name="xge" type="xsd:boolean"
+                             use="optional" default="false" />
             </xsd:extension>
           </xsd:complexContent>
         </xsd:complexType>
@@ -291,10 +362,14 @@ authorization from the authors.
           <xsd:sequence minOccurs="1" maxOccurs="unbounded">
             <xsd:element name="item">
               <xsd:complexType>
-                <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
+                <xsd:choice minOccurs="1" maxOccurs="1">
+                  <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>
             </xsd:element>
+            <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
           </xsd:sequence>
           <xsd:attribute name="name" type="xsd:string" use="required" />
         </xsd:complexType>