From 4c7f67e7616181aec0b9210b735cb6b9b2cc957e Mon Sep 17 00:00:00 2001
From: Alain Mosnier <alain@wanamoon.net>
Date: Mon, 11 May 2020 21:41:01 +0200
Subject: [PATCH] Corrected mistakes in ST's SVD files (STM32G4, STM32L4+,
 STM32H7x7)

ecg generates static asserts that automatically detect these at
compile time. :-)

Maybe ST should start ecging their SVD files before they release
them...
---
 svd/STM32G4/STM32G431xx.svd   | 2 +-
 svd/STM32G4/STM32G441xx.svd   | 2 +-
 svd/STM32G4/STM32G471xx.svd   | 2 +-
 svd/STM32G4/STM32G473xx.svd   | 8 ++++----
 svd/STM32G4/STM32G474xx.svd   | 8 ++++----
 svd/STM32G4/STM32G483xx.svd   | 8 ++++----
 svd/STM32G4/STM32G484xx.svd   | 8 ++++----
 svd/STM32G4/STM32GBK1CBT6.svd | 2 +-
 svd/STM32H7/STM32H7x7_CM4.svd | 4 ++--
 svd/STM32H7/STM32H7x7_CM7.svd | 4 ++--
 svd/STM32L4+/STM32L4R5.svd    | 6 +++---
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/svd/STM32G4/STM32G431xx.svd b/svd/STM32G4/STM32G431xx.svd
index 9e999dc..03640ce 100644
--- a/svd/STM32G4/STM32G431xx.svd
+++ b/svd/STM32G4/STM32G431xx.svd
@@ -24645,7 +24645,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G441xx.svd b/svd/STM32G4/STM32G441xx.svd
index 06161c6..1a3e059 100644
--- a/svd/STM32G4/STM32G441xx.svd
+++ b/svd/STM32G4/STM32G441xx.svd
@@ -24648,7 +24648,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G471xx.svd b/svd/STM32G4/STM32G471xx.svd
index 80b31a1..0f8c0a4 100644
--- a/svd/STM32G4/STM32G471xx.svd
+++ b/svd/STM32G4/STM32G471xx.svd
@@ -25115,7 +25115,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G473xx.svd b/svd/STM32G4/STM32G473xx.svd
index 51bd1de..7158f7d 100644
--- a/svd/STM32G4/STM32G473xx.svd
+++ b/svd/STM32G4/STM32G473xx.svd
@@ -26281,7 +26281,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26369,7 +26369,7 @@
                <name>COMP_C5CSR</name>
                <displayName>COMP_C5CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x16</addressOffset>
+               <addressOffset>0x10</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26457,7 +26457,7 @@
                <name>COMP_C6CSR</name>
                <displayName>COMP_C6CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x20</addressOffset>
+               <addressOffset>0x14</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26545,7 +26545,7 @@
                <name>COMP_C7CSR</name>
                <displayName>COMP_C7CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x24</addressOffset>
+               <addressOffset>0x18</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G474xx.svd b/svd/STM32G4/STM32G474xx.svd
index 032e67e..40b4b20 100644
--- a/svd/STM32G4/STM32G474xx.svd
+++ b/svd/STM32G4/STM32G474xx.svd
@@ -25760,7 +25760,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -25848,7 +25848,7 @@
                <name>COMP_C5CSR</name>
                <displayName>COMP_C5CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x16</addressOffset>
+               <addressOffset>0x10</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -25936,7 +25936,7 @@
                <name>COMP_C6CSR</name>
                <displayName>COMP_C6CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x20</addressOffset>
+               <addressOffset>0x14</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26024,7 +26024,7 @@
                <name>COMP_C7CSR</name>
                <displayName>COMP_C7CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x24</addressOffset>
+               <addressOffset>0x18</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G483xx.svd b/svd/STM32G4/STM32G483xx.svd
index 55b5b51..3c22b9f 100644
--- a/svd/STM32G4/STM32G483xx.svd
+++ b/svd/STM32G4/STM32G483xx.svd
@@ -26281,7 +26281,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26369,7 +26369,7 @@
                <name>COMP_C5CSR</name>
                <displayName>COMP_C5CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x16</addressOffset>
+               <addressOffset>0x10</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26457,7 +26457,7 @@
                <name>COMP_C6CSR</name>
                <displayName>COMP_C6CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x20</addressOffset>
+               <addressOffset>0x14</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26545,7 +26545,7 @@
                <name>COMP_C7CSR</name>
                <displayName>COMP_C7CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x24</addressOffset>
+               <addressOffset>0x18</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32G484xx.svd b/svd/STM32G4/STM32G484xx.svd
index 0609629..641f284 100644
--- a/svd/STM32G4/STM32G484xx.svd
+++ b/svd/STM32G4/STM32G484xx.svd
@@ -26281,7 +26281,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26369,7 +26369,7 @@
                <name>COMP_C5CSR</name>
                <displayName>COMP_C5CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x16</addressOffset>
+               <addressOffset>0x10</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26457,7 +26457,7 @@
                <name>COMP_C6CSR</name>
                <displayName>COMP_C6CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x20</addressOffset>
+               <addressOffset>0x14</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
@@ -26545,7 +26545,7 @@
                <name>COMP_C7CSR</name>
                <displayName>COMP_C7CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x24</addressOffset>
+               <addressOffset>0x18</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32G4/STM32GBK1CBT6.svd b/svd/STM32G4/STM32GBK1CBT6.svd
index 8559904..8ee90d5 100644
--- a/svd/STM32G4/STM32GBK1CBT6.svd
+++ b/svd/STM32G4/STM32GBK1CBT6.svd
@@ -23619,7 +23619,7 @@
                <name>COMP_C4CSR</name>
                <displayName>COMP_C4CSR</displayName>
                <description>Comparator control/status           register</description>
-               <addressOffset>0x12</addressOffset>
+               <addressOffset>0x0C</addressOffset>
                <size>0x20</size>
                <resetValue>0x00000000</resetValue>
                <fields>
diff --git a/svd/STM32H7/STM32H7x7_CM4.svd b/svd/STM32H7/STM32H7x7_CM4.svd
index e3cae6c..1b3820a 100644
--- a/svd/STM32H7/STM32H7x7_CM4.svd
+++ b/svd/STM32H7/STM32H7x7_CM4.svd
@@ -65244,7 +65244,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
               <bitWidth>15</bitWidth>
             </field>
             <field>
-              <name>CNT[31]</name>
+              <name>CNT_31</name>
               <description>Value depends on IUFREMAP in
               TIMx_CR1.</description>
               <bitOffset>31</bitOffset>
@@ -68341,7 +68341,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
               <bitWidth>15</bitWidth>
             </field>
             <field>
-              <name>CNT[31]</name>
+              <name>CNT_31</name>
               <description>UIFCPY</description>
               <bitOffset>31</bitOffset>
               <bitWidth>1</bitWidth>
diff --git a/svd/STM32H7/STM32H7x7_CM7.svd b/svd/STM32H7/STM32H7x7_CM7.svd
index 757f6cf..0f296aa 100644
--- a/svd/STM32H7/STM32H7x7_CM7.svd
+++ b/svd/STM32H7/STM32H7x7_CM7.svd
@@ -65244,7 +65244,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
               <bitWidth>15</bitWidth>
             </field>
             <field>
-              <name>CNT[31]</name>
+              <name>CNT_31</name>
               <description>Value depends on IUFREMAP in
               TIMx_CR1.</description>
               <bitOffset>31</bitOffset>
@@ -68341,7 +68341,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
               <bitWidth>15</bitWidth>
             </field>
             <field>
-              <name>CNT[31]</name>
+              <name>CNT_31</name>
               <description>UIFCPY</description>
               <bitOffset>31</bitOffset>
               <bitWidth>1</bitWidth>
diff --git a/svd/STM32L4+/STM32L4R5.svd b/svd/STM32L4+/STM32L4R5.svd
index d002a6f..c369e4b 100644
--- a/svd/STM32L4+/STM32L4R5.svd
+++ b/svd/STM32L4+/STM32L4R5.svd
@@ -15556,9 +15556,9 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
           </fields>
         </register>
         <register>
-          <name>CH7WDATR</name>
-          <displayName>CH7WDATR</displayName>
-          <description>CH7WDATR</description>
+          <name>CH7DATINR</name>
+          <displayName>CH7DATINR</displayName>
+          <description>CH7DATINR</description>
           <addressOffset>0xF0</addressOffset>
           <size>0x20</size>
           <access>read-write</access>