Reordered data-type definitions to match the order in the spec.

Author: hicklin

src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml

@@ -17,16 +17,7 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
 
-  <!-- Enum definitions for structures-->
-  <enum name="OperationalStatusEnum" type="enum8">
-    <cluster code="0x0150"/>
-    <item value="0x00" name="Pending"/>
-    <item value="0x01" name="Operating"/>
-    <item value="0x02" name="Skipped"/>
-    <item value="0x03" name="Completed"/>
-  </enum>
-
-  <!-- Data types -->
+  Data types
   <struct name="LocationInfoStruct">
     <cluster code="0x0150"/>
     <item name="LocationInfo"  type="HomeLocationStruct"    optional="false" isNullable="true"/>
@@ -48,6 +39,14 @@ limitations under the License.
     <item name="LocationInfo" type="LocationInfoStruct"      optional="false" isNullable="false"/>
   </struct>
 
+  <enum name="OperationalStatusEnum" type="enum8">
+    <cluster code="0x0150"/>
+    <item value="0x00" name="Pending"/>
+    <item value="0x01" name="Operating"/>
+    <item value="0x02" name="Skipped"/>
+    <item value="0x03" name="Completed"/>
+  </enum>
+
   <struct name="ProgressStruct">
     <cluster code="0x0150"/>
     <item name="LocationID"             type="int32u"                 optional="false"/>
@@ -56,7 +55,6 @@ limitations under the License.
     <item name="EstimatedTime"          type="elapsed_s"              optional="true" isNullable="true"/>
   </struct>
 
-  <!-- Enum definitions for select locations command response-->
   <enum name="SelectLocationsStatus" type="enum8">
     <cluster code="0x0150"/>
     <item value="0x00" name="Success"/>
@@ -66,15 +64,13 @@ limitations under the License.
     <item value="0x04" name="InvalidSet"/>
   </enum>
 
-  <!-- Enum definitions for skip location command response-->
   <enum name="SkipCurrentLocationStatus" type="enum8">
     <cluster code="0x0150"/>
     <item value="0x00" name="Success"/>
     <item value="0x01" name="InvalidLocationList"/>
     <item value="0x02" name="InvalidInMode"/>
   </enum>
 
-
   <cluster>
     <domain>General</domain>
     <name>Service Area</name>
@@ -88,7 +84,8 @@ limitations under the License.
       </feature>
       <feature bit="1" code="SELRUN" name="SelectWhileRunning" summary="The device allows changing the selected locations while running">
         <optionalConform/>
-    </feature>
+      </feature>
+    </features>
 
     <!-- Attributes -->
     <attribute side="server" code="0x0000" define="SupportedLocations"  type="array"     entryType="LocationStruct"  writable="false" isNullable="false" optional="false">SupportedLocations</attribute>
@@ -124,8 +121,8 @@ limitations under the License.
       <description>
         This command is sent by the device on receipt of the SelectLocations command.
       </description>
-      <arg name="Status"     type="SkipCurrentStatus"              optional="false"/>
-      <arg name="StatusText" type="char_string"       length="256" optional="true"/>
+      <arg name="Status"     type="SkipCurrentLocationStatus"  optional="false"/>
+      <arg name="StatusText" type="char_string"                length="256" optional="true"/>
     </command>
 
   </cluster>