git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4463 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 143 insertions, 140 deletions

diff --git a/tools/gencfg/schema/hal/abstract_adc_cfg.xsd b/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
index 4a2901c4e..52a6c9096 100644
--- a/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
+++ b/tools/gencfg/schema/hal/abstract_adc_cfg.xsd
@@ -7,29 +7,37 @@
   <xs:complexType name="AbstractAdcGroupCfgType">

     <xs:complexContent>

       <xs:extension base="DocumentedItem">

-        <xs:attribute name="circular" type="xs:boolean"

-          use="required">

-        </xs:attribute>

-        <xs:attribute name="conversion_callback" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:pattern value="\w?[\w\d_]*"></xs:pattern>

-              <xs:minLength value="0"></xs:minLength>

-              <xs:maxLength value="24"></xs:maxLength>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="error_callback" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:pattern value="\w?[\w\d_]*"></xs:pattern>

-              <xs:minLength value="0"></xs:minLength>

-              <xs:maxLength value="24"></xs:maxLength>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

+        <xs:sequence>

+          <xs:element name="circular" maxOccurs="1" minOccurs="1">

+

+            <xs:simpleType>

+              <xs:restriction base="xs:boolean">

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="conv_callback" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:minLength value="0"></xs:minLength>

+                <xs:maxLength value="24"></xs:maxLength>

+                <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="error_callback" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:minLength value="0"></xs:minLength>

+                <xs:maxLength value="24"></xs:maxLength>

+

+                <xs:pattern value="\w[\w\d_]*"></xs:pattern>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+        </xs:sequence>




       </xs:extension>

     </xs:complexContent>

   </xs:complexType>

@@ -37,7 +45,7 @@
 

   <xs:complexType name="AbstractAdcCfgType">

     <xs:complexContent>

-      <xs:extension base="DocumentedItem"></xs:extension>

+      <xs:extension base="AbstractDriverCfgType"></xs:extension>

     </xs:complexContent>

   </xs:complexType>

 </xs:schema>

diff --git a/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd b/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
index c038263c2..331933109 100644
--- a/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
+++ b/tools/gencfg/schema/hal/stm32f4xx/stm32f4xx_adc_cfg.xsd
@@ -20,34 +20,103 @@
       </xs:extension>

     </xs:complexContent>

   </xs:complexType>
-
-  <xs:complexType name="STM32F4xxAdcChannelSettingsType">
-    <xs:attribute name="sample" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_15"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_28"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_56"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_84"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_112"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_144"></xs:enumeration>
-          <xs:enumeration value="ADC_SAMPLE_480"></xs:enumeration>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>

-  </xs:complexType>

+

 

   <xs:complexType name="STM32F4xxAdcGroupCfgType">

     <xs:complexContent>

       <xs:extension base="AbstractAdcGroupCfgType">

         <xs:sequence>

-          <xs:element name="sample_time" maxOccurs="1"

+          <xs:element name="alignment" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Samples are Right Aligned"></xs:enumeration>

+                <xs:enumeration value="1 Samples are Left Aligned"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="resolution" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 12 bits"></xs:enumeration>

+                <xs:enumeration value="1 10 bits"></xs:enumeration>

+                <xs:enumeration value="2 8 bits"></xs:enumeration>

+                <xs:enumeration value="3 6 bits"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="trigger_mode" maxOccurs="1" minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Software"></xs:enumeration>

+                <xs:enumeration value="1 Rising Edge"></xs:enumeration>

+                <xs:enumeration value="2 Falling Edge"></xs:enumeration>

+                <xs:enumeration value="3 Both Edges"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="trigger_source" maxOccurs="1"

             minOccurs="1">

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Timer 1 CC1 event"></xs:enumeration>

+                <xs:enumeration value="1 Timer 1 CC2 event"></xs:enumeration>

+                <xs:enumeration value="2 Timer 1 CC3 event"></xs:enumeration>

+                <xs:enumeration value="3 Timer 2 CC2 event"></xs:enumeration>

+                <xs:enumeration value="4 Timer 2 CC3 event"></xs:enumeration>

+                <xs:enumeration value="5 Timer 2 CC4 event"></xs:enumeration>

+                <xs:enumeration value="6 Timer 2 TRGO event"></xs:enumeration>

+                <xs:enumeration value="7 Timer 3 CC1 event"></xs:enumeration>

+                <xs:enumeration value="8 Timer 3 TRGO event"></xs:enumeration>

+                <xs:enumeration value="9 Timer 4 CC4 event"></xs:enumeration>

+                <xs:enumeration value="10 Timer 5 CC1 event"></xs:enumeration>

+                <xs:enumeration value="11 Timer 5 CC2 event"></xs:enumeration>

+                <xs:enumeration value="12 Timer 5 CC3 event"></xs:enumeration>

+                <xs:enumeration value="13 Timer 8 CC1 event"></xs:enumeration>

+                <xs:enumeration value="14 Timer 8 CC4 event"></xs:enumeration>

+                <xs:enumeration value="15 EXTI line15"></xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>


+          <xs:element name="discontinuous" maxOccurs="1"

+            minOccurs="1">

+

+            <xs:simpleType>

+              <xs:restriction base="xs:string">

+                <xs:enumeration value="0 Disabled"></xs:enumeration>

+                <xs:enumeration value="1 One discontinous conversion"></xs:enumeration>

+                <xs:enumeration

+                  value="2 Two discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="3 Three discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="4 Four discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="5 Five discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="6 Six discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="7 Seven discontinous conversions">

+                </xs:enumeration>

+                <xs:enumeration

+                  value="8 Eight discontinous conversions">

+                </xs:enumeration>

+                <xs:whiteSpace value="collapse"></xs:whiteSpace>

+              </xs:restriction>

+            </xs:simpleType>

+          </xs:element>

+          <xs:element name="sample_time" maxOccurs="1" minOccurs="1">

             <xs:complexType>

               <xs:sequence>

-                <xs:element name="IN0" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN0" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -61,8 +130,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN1" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN1" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -76,8 +144,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN2" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN2" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -91,8 +158,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN3" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN3" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -106,8 +172,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN4" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN4" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -121,8 +186,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN5" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN5" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -136,8 +200,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN6" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN6" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -151,8 +214,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN7" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN7" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -166,8 +228,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN8" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN8" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -181,8 +242,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN9" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN9" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -196,8 +256,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN10" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN10" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -211,8 +270,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN11" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN11" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -226,8 +284,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN12" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN12" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -241,8 +298,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN13" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN13" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -256,8 +312,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN14" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN14" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -271,8 +326,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="IN15" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="IN15" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -286,8 +340,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="SENSOR" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="SENSOR" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -316,8 +369,7 @@
                     </xs:restriction>

                   </xs:simpleType>

                 </xs:element>

-                <xs:element name="VBAT" maxOccurs="1"

-                  minOccurs="1">

+                <xs:element name="VBAT" maxOccurs="1" minOccurs="1">

                   <xs:simpleType>

                     <xs:restriction base="xs:string">

                       <xs:enumeration value="ADC_SAMPLE_3"></xs:enumeration>

@@ -368,68 +420,11 @@
             </xs:complexType>

           </xs:element>

         </xs:sequence>

-        <xs:attribute name="alignment" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Samples are Right Aligned"></xs:enumeration>

-              <xs:enumeration value="1 Samples are Left Aligned"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="resolution" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 12 bits"></xs:enumeration>

-              <xs:enumeration value="1 10 bits"></xs:enumeration>

-              <xs:enumeration value="2 8 bits"></xs:enumeration>

-              <xs:enumeration value="3 6 bits"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="trigger_mode" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Software"></xs:enumeration>

-              <xs:enumeration value="1 Rising Edge"></xs:enumeration>

-              <xs:enumeration value="2 Falling Edge"></xs:enumeration>

-              <xs:enumeration value="3 Both Edges"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="trigger_source" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="0 Timer 1 CC1 event"></xs:enumeration>

-              <xs:enumeration value="1 Timer 1 CC2 event"></xs:enumeration>

-              <xs:enumeration value="2 Timer 1 CC3 event"></xs:enumeration>

-              <xs:enumeration value="3 Timer 2 CC2 event"></xs:enumeration>

-              <xs:enumeration value="4 Timer 2 CC3 event"></xs:enumeration>

-              <xs:enumeration value="5 Timer 2 CC4 event"></xs:enumeration>

-              <xs:enumeration value="6 Timer 2 TRGO event"></xs:enumeration>

-              <xs:enumeration value="7 Timer 3 CC1 event"></xs:enumeration>

-              <xs:enumeration value="8 Timer 3 TRGO event"></xs:enumeration>

-              <xs:enumeration value="9 Timer 4 CC4 event"></xs:enumeration>

-              <xs:enumeration value="10 Timer 5 CC1 event"></xs:enumeration>

-              <xs:enumeration value="11 Timer 5 CC2 event"></xs:enumeration>

-              <xs:enumeration value="12 Timer 5 CC3 event"></xs:enumeration>

-              <xs:enumeration value="13 Timer 8 CC1 event"></xs:enumeration>

-              <xs:enumeration value="14 Timer 8 CC4 event"></xs:enumeration>

-              <xs:enumeration value="15 EXTI line15"></xs:enumeration>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="discontinuous_mode" type="xs:boolean"

-          use="required">

-        </xs:attribute>

-        <xs:attribute name="discontinuous_number" use="required">

-          <xs:simpleType>

-            <xs:restriction base="xs:int">

-              <xs:minInclusive value="1"></xs:minInclusive>

-              <xs:maxInclusive value="8"></xs:maxInclusive>

-              <xs:whiteSpace value="collapse"></xs:whiteSpace>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

+

+

+

+

+

       </xs:extension>

     </xs:complexContent>

   </xs:complexType>