X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsync.xml;h=23175cb3565e406371802ebebb374554a4ce846f;hb=bd4fa19af8bff7efb997afc2617e3d26b1b0eb63;hp=516d149abfe48884960f10019f36a69594a935b7;hpb=fb2af7c138f2138b065ec2da5070a9fc940af54f;p=free-sw%2Fxcb%2Fproto

diff --git a/src/sync.xml b/src/sync.xml
index 516d149..23175cb 100644
--- a/src/sync.xml
+++ b/src/sync.xml
@@ -11,9 +11,9 @@ for licensing information.
   <xidtype name="ALARM" />
 
   <enum name="ALARMSTATE">
-    <item name="Active" />
-    <item name="Inactive" />
-    <item name="Destroyed" />
+    <item name="Active">    <value>0</value> </item>
+    <item name="Inactive">  <value>1</value> </item>
+    <item name="Destroyed"> <value>2</value> </item>
   </enum>
 
   <xidtype name="COUNTER" />
@@ -21,15 +21,15 @@ for licensing information.
   <xidtype name="FENCE" />
 
   <enum name="TESTTYPE">
-    <item name="PositiveTransition" />
-    <item name="NegativeTransition" />
-    <item name="PositiveComparison" />
-    <item name="NegativeComparison" />
+    <item name="PositiveTransition"> <value>0</value> </item>
+    <item name="NegativeTransition"> <value>1</value> </item>
+    <item name="PositiveComparison"> <value>2</value> </item>
+    <item name="NegativeComparison"> <value>3</value> </item>
   </enum>
 
   <enum name="VALUETYPE">
-    <item name="Absolute" />
-    <item name="Relative" />
+    <item name="Absolute"> <value>0</value> </item>
+    <item name="Relative"> <value>1</value> </item>
   </enum>
 
   <enum name="CA">
@@ -48,7 +48,7 @@ for licensing information.
 
   <struct name="SYSTEMCOUNTER">
     <field type="COUNTER" name="counter" />
-    <field type="INT64" name="resolution" />
+    <field type="sync:INT64" name="resolution" />
     <field type="CARD16" name="name_len" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
@@ -58,13 +58,13 @@ for licensing information.
   <struct name="TRIGGER">
     <field type="COUNTER" name="counter" />
     <field type="CARD32" name="wait_type" enum="VALUETYPE" />
-    <field type="INT64" name="wait_value" />
+    <field type="sync:INT64" name="wait_value" />
     <field type="CARD32" name="test_type" enum="TESTTYPE" />
   </struct>
 
   <struct name="WAITCONDITION">
     <field type="TRIGGER" name="trigger" />
-    <field type="INT64" name="event_threshold" />
+    <field type="sync:INT64" name="event_threshold" />
   </struct>
 
   <error name="Counter" number="0">
@@ -103,7 +103,7 @@ for licensing information.
 
   <request name="CreateCounter" opcode="2">
     <field type="COUNTER" name="id" />
-    <field type="INT64" name="initial_value" />
+    <field type="sync:INT64" name="initial_value" />
   </request>
 
   <request name="DestroyCounter" opcode="6">
@@ -114,7 +114,7 @@ for licensing information.
     <field type="COUNTER" name="counter" />
     <reply>
       <pad bytes="1" />
-      <field type="INT64" name="counter_value" />
+      <field type="sync:INT64" name="counter_value" />
     </reply>
   </request>
 
@@ -124,26 +124,76 @@ for licensing information.
 
   <request name="ChangeCounter" opcode="4">
     <field type="COUNTER" name="counter" />
-    <field type="INT64" name="amount" />
+    <field type="sync:INT64" name="amount" />
   </request>
 
   <request name="SetCounter" opcode="3">
     <field type="COUNTER" name="counter" />
-    <field type="INT64" name="value" />
+    <field type="sync:INT64" name="value" />
   </request>
 
   <request name="CreateAlarm" opcode="8">
     <field type="ALARM" name="id" />
-    <valueparam value-mask-type="CARD32"
-                value-mask-name="value_mask"
-                value-list-name="value_list" />
+    <field type="CARD32" name="value_mask" mask="CA" />
+    <switch name="value_list">
+      <fieldref>value_mask</fieldref>
+      <bitcase>
+        <enumref ref="CA">Counter</enumref>
+        <field type="COUNTER" name="counter" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">ValueType</enumref>
+        <field type="CARD32" name="valueType" enum="VALUETYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Value</enumref>
+        <field type="sync:INT64" name="value" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">TestType</enumref>
+        <field type="CARD32" name="testType" enum="TESTTYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Delta</enumref>
+        <field type="sync:INT64" name="delta" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Events</enumref>
+        <field type="CARD32" name="events" />
+      </bitcase>
+    </switch>
   </request>
 
   <request name="ChangeAlarm" opcode="9">
     <field type="ALARM" name="id" />
-    <valueparam value-mask-type="CARD32"
-                value-mask-name="value_mask"
-                value-list-name="value_list" />
+    <field type="CARD32" name="value_mask" mask="CA" />
+    <switch name="value_list">
+      <fieldref>value_mask</fieldref>
+      <bitcase>
+        <enumref ref="CA">Counter</enumref>
+        <field type="COUNTER" name="counter" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">ValueType</enumref>
+        <field type="CARD32" name="valueType" enum="VALUETYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Value</enumref>
+        <field type="sync:INT64" name="value" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">TestType</enumref>
+        <field type="CARD32" name="testType" enum="TESTTYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Delta</enumref>
+        <field type="sync:INT64" name="delta" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Events</enumref>
+        <field type="CARD32" name="events" />
+      </bitcase>
+    </switch>
   </request>
 
   <request name="DestroyAlarm" opcode="11">
@@ -155,7 +205,7 @@ for licensing information.
     <reply>
       <pad bytes="1" />
       <field type="TRIGGER" name="trigger" />
-      <field type="INT64" name="delta" />
+      <field type="sync:INT64" name="delta" />
       <field type="BOOL" name="events" />
       <field type="CARD8" name="state" enum="ALARMSTATE" />
       <pad bytes="2" />
@@ -209,8 +259,8 @@ for licensing information.
   <event name="CounterNotify" number="0">
     <field type="CARD8" name="kind" />
     <field type="COUNTER" name="counter" />
-    <field type="INT64" name="wait_value" />
-    <field type="INT64" name="counter_value" />
+    <field type="sync:INT64" name="wait_value" />
+    <field type="sync:INT64" name="counter_value" />
     <field type="TIMESTAMP" name="timestamp" />
     <field type="CARD16" name="count" />
     <field type="BOOL" name="destroyed" />
@@ -220,8 +270,8 @@ for licensing information.
   <event name="AlarmNotify" number="1">
     <field type="CARD8" name="kind" />
     <field type="ALARM" name="alarm" />
-    <field type="INT64" name="counter_value" />
-    <field type="INT64" name="alarm_value" />
+    <field type="sync:INT64" name="counter_value" />
+    <field type="sync:INT64" name="alarm_value" />
     <field type="TIMESTAMP" name="timestamp" />
     <field type="CARD8" name="state" enum="ALARMSTATE" />
     <pad bytes="3" />