Apply review suggestions from #35775

project-chip · Sep 25, 2024 · f4dff4a · f4dff4a
1 parent 2276650
commit f4dff4a
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/app/zap-templates/zcl/zcl.xsd b/src/app/zap-templates/zcl/zcl.xsd
@@ -13,14 +13,19 @@ This schema describes the format of the XML files, that describe the ZCL specifi
       <xs:pattern value="[-+]?(0x[0-9A-Fa-f]+|[0-9]+)"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="uIntegerWithHex">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(0x[0-9A-Fa-f]+|[0-9]+)"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:complexType name="access">
     <xs:attribute name="op" type="xs:string"/>
     <xs:attribute name="role" type="xs:string"/>
     <xs:attribute name="privilege" type="xs:string"/>
     <xs:attribute name="modifier" type="xs:string"/>
   </xs:complexType>
   <xs:complexType name="eventField">
-    <xs:attribute name="id" use="required" type="xs:string"/>
+    <xs:attribute name="id" use="required" type="uIntegerWithHex"/>
     <xs:attribute name="name" use="required" type="xs:string"/>
     <xs:attribute name="type" use="required" type="xs:string"/>
     <xs:attribute name="array" type="xs:boolean"/>
@@ -34,7 +39,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
     <xs:attribute name="description" use="required" type="xs:string"/>
   </xs:complexType>
   <xs:complexType name="arg">
-    <xs:attribute name="id" type="integerWithHex" />
+    <xs:attribute name="id" type="uIntegerWithHex" />
     <xs:attribute name="min" type="integerWithHex"/>
     <xs:attribute name="max" type="integerWithHex"/>
     <xs:attribute name="arrayLength" type="xs:boolean"/>
@@ -123,7 +128,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
       <xs:sequence>
         <xs:element ref="description"/>
       </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:string"/>
+      <xs:attribute name="id" use="required" type="uIntegerWithHex"/>
       <xs:attribute name="name" use="required"/>
     </xs:complexType>
   </xs:element>
@@ -249,7 +254,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
   </xs:element>
   <xs:element name="type">
     <xs:complexType>
-      <xs:attribute name="id" use="required" type="xs:string"/>
+      <xs:attribute name="id" use="required" type="uIntegerWithHex"/>
       <xs:attribute name="name" use="required" type="xs:string"/>
       <xs:attribute name="description" use="required" type="xs:string"/>
       <xs:attribute name="size" type="integerWithHex"/>
@@ -338,7 +343,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
       <xs:attribute name="introducedIn" type="xs:string"/>
       <xs:attribute name="manufacturerCode" type="zclCode"/>
       <xs:attribute name="singleton" type="xs:boolean"/>
-      <xs:attribute name="apiMaturity" type = "zclApiMaturity" />
+      <xs:attribute name="apiMaturity" type="zclApiMaturity" />
     </xs:complexType>
   </xs:element>
   <xs:element name="code" type="zclCode"/>
@@ -394,7 +399,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
       </xs:sequence>
       <xs:attribute name="length" type="integerWithHex"/>
       <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="apiMaturity" type = "zclApiMaturity" />
+      <xs:attribute name="apiMaturity" type="zclApiMaturity" />
     </xs:complexType>
   </xs:element>
   <xs:element name="callback">
@@ -416,7 +421,7 @@ This schema describes the format of the XML files, that describe the ZCL specifi
       <xs:attribute name="category" type="xs:string"/>
       <xs:attribute name="cluster"/>
       <xs:attribute name="consumed" type="xs:boolean"/>
-      <xs:attribute name="id" use="required" type="xs:string"/>
+      <xs:attribute name="id" use="required" type="uIntegerWithHex"/>
       <xs:attribute name="name" use="required"/>
       <xs:attribute name="platformType" type="xs:string"/>
       <xs:attribute name="returnType" use="required" type="xs:string"/>