Skip to content

Commit e4d6962

Browse files
bors[bot]cpunionadamgreig
authored
Merge #719
719: Change the groupName of ADC_Common from ADC to ADC_Common r=adamgreig a=cpunion In the https://github.com/tinygo-org/stm32-svd project, it depends this project and generates types by the peripheral's groupName. Because the ADC_Common's groupName is ADC, it can't generate the types ADC and ADC_Common correctly. I want to change the ADC_Common's groupName to ADC to make it work fine. See tinygo-org/tinygo#2717 , tinygo-org/stm32-svd#7 , but those are not good way. I checked the generated rust code, it's not changed after apply this change and run make, seems it doesn't depend groupName. So can you accept this PR? Co-authored-by: Li Jie <cpunion@gmail.com> Co-authored-by: Adam Greig <adam@adamgreig.com>
2 parents b49431a + 1306b63 commit e4d6962

30 files changed

+34
-5
lines changed

‎devices/common_patches/adc_common_group_name.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Rename group name of ADC_Common from ADC to ADC_Common
2+
3+
_modify:
4+
ADC_Common:
5+
groupName: ADC_Common

‎devices/common_patches/l4_adc_common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _add:
44
# from RM0394.
55
ADC_Common:
66
description: ADC common registers
7-
groupName: ADC
7+
groupName: ADC_Common
88
baseAddress: 0x50040300
99
addressBlock:
1010
offset: 0

‎devices/common_patches/wb_adc_common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _add:
55
# from RM0434.
66
ADC_Common:
77
description: ADC common registers
8-
groupName: ADC
8+
groupName: ADC_Common
99
baseAddress: 0x50040300
1010
addressBlock:
1111
offset: 0

‎devices/stm32f215.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ _include:
9696
- common_patches/usb_otg/otg_fs_remove_prefix.yaml
9797
- common_patches/usb_otg/otg_fs_fixes_v1.yaml
9898
- common_patches/dbgmcu.yaml
99+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f217.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@ _include:
9393
- common_patches/rtc/rtc_bkpr.yaml
9494
- common_patches/rtc/rtc_cr.yaml
9595
- common_patches/dbgmcu.yaml
96+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f401.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,4 @@ _include:
163163
- ../peripherals/sdio/sdio_f4.yaml
164164
- common_patches/i2c_v1_fltr.yaml
165165
- ../peripherals/i2c/i2c_v1_fltr.yaml
166+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f405.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ _include:
133133
- common_patches/f4_rtc_cr.yaml
134134
- common_patches/rtc/rtc_cr.yaml
135135
- ../peripherals/rtc/rtc_common.yaml
136+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f407.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,4 @@ _include:
141141
- common_patches/rtc/rtc_cr.yaml
142142
- ../peripherals/rtc/rtc_common.yaml
143143
- ../peripherals/sdio/sdio_f4.yaml
144+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f410.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,4 @@ _include:
213213
- ../peripherals/rtc/rtc_common.yaml
214214
- common_patches/i2c_v1_fltr.yaml
215215
- ../peripherals/i2c/i2c_v1_fltr.yaml
216+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f411.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,4 @@ _include:
186186
- ../peripherals/sdio/sdio_f4.yaml
187187
- common_patches/i2c_v1_fltr.yaml
188188
- ../peripherals/i2c/i2c_v1_fltr.yaml
189+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f412.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,3 +461,4 @@ _include:
461461
- ../peripherals/sdio/sdio_f4.yaml
462462
- common_patches/i2c_v1_fltr.yaml
463463
- ../peripherals/i2c/i2c_v1_fltr.yaml
464+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f413.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,4 @@ _include:
247247
- ../peripherals/rtc/rtc_common.yaml
248248
- ../peripherals/sdio/sdio_f4.yaml
249249
- ../peripherals/i2c/i2c_v1_fltr.yaml
250+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f427.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,3 +259,4 @@ _include:
259259
- ../peripherals/rtc/rtc_common.yaml
260260
- ../peripherals/sdio/sdio_f4.yaml
261261
- ../peripherals/i2c/i2c_v1_fltr.yaml
262+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f429.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,4 @@ _include:
217217
- ../peripherals/flash/flash_latency16.yaml
218218
- ../peripherals/sdio/sdio_f4.yaml
219219
- ../peripherals/i2c/i2c_v1_fltr.yaml
220+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f446.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,3 +597,4 @@ _include:
597597
- ../peripherals/flash/flash_latency16.yaml
598598
- ../peripherals/rcc/rcc_v2_pllcfgr_pllr.yaml
599599
- ../peripherals/i2c/i2c_v1_fltr.yaml
600+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f469.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,4 @@ _include:
193193
- ../peripherals/rtc/rtc_common.yaml
194194
- ../peripherals/sdio/sdio_f4.yaml
195195
- ../peripherals/i2c/i2c_v1_fltr.yaml
196+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f730.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ _include:
8181
- ../peripherals/sai/sai.yaml
8282
- common_patches/rtc/rtc_cr.yaml
8383
- ../peripherals/rtc/rtc_common.yaml
84+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f745.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,4 @@ _include:
195195
- ../peripherals/dma/dma2d_v1.yaml
196196
- common_patches/rtc/rtc_cr.yaml
197197
- ../peripherals/rtc/rtc_common.yaml
198+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f750.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,4 @@ _include:
121121
- common_patches/ltdc/ltdc.yaml
122122
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
123123
- ../peripherals/ltdc/ltdc.yaml
124+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f765.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,3 +218,4 @@ _include:
218218
- ../peripherals/dma/dma2d_v1.yaml
219219
- common_patches/rtc/rtc_cr.yaml
220220
- ../peripherals/rtc/rtc_common.yaml
221+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ _include:
8282
- ../peripherals/sai/sai.yaml
8383
- common_patches/rtc/rtc_cr.yaml
8484
- ../peripherals/rtc/rtc_common.yaml
85+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x3.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ _include:
9292
- ../peripherals/sai/sai.yaml
9393
- common_patches/rtc/rtc_cr.yaml
9494
- ../peripherals/rtc/rtc_common.yaml
95+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x6.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,4 @@ _include:
181181
- ../peripherals/dma/dma2d_v1.yaml
182182
- common_patches/rtc/rtc_cr.yaml
183183
- ../peripherals/rtc/rtc_common.yaml
184+
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _add:
99
# from RM0410.
1010
ADC_Common:
1111
description: ADC common registers
12-
groupName: ADC
12+
groupName: ADC_Common
1313
baseAddress: 0x40012300
1414
addressBlock:
1515
offset: 0x0

‎devices/stm32f7x9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _add:
99
# from RM0410.
1010
ADC_Common:
1111
description: ADC common registers
12-
groupName: ADC
12+
groupName: ADC_Common
1313
baseAddress: 0x40012300
1414
addressBlock:
1515
offset: 0x0

‎devices/stm32l4r9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ _include:
9797
- common_patches/usb_otg/otg_fs_remove_prefix.yaml
9898
- common_patches/usb_otg/otg_fs_fixes_v1.yaml
9999
- common_patches/l4_lpuart_presc.yaml
100-
100+
- common_patches/adc_common_group_name.yaml

‎devices/stm32l4x5.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,4 @@ _include:
198198
- ./common_patches/l4_dbg_apb_fzr_rename.yaml
199199
- ../peripherals/spi/spi_l4.yaml
200200
- ./common_patches/l4_tim15_ch2.yaml
201+
- common_patches/adc_common_group_name.yaml

‎devices/stm32l4x6.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ _include:
9292
- ../peripherals/spi/spi_l4.yaml
9393
- ./common_patches/l4_dbg_apb_fzr_rename.yaml
9494
- ./common_patches/l4_lcd_segment.yaml
95+
- common_patches/adc_common_group_name.yaml

‎devices/stm32l552.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ _include:
4747
- ./common_patches/sai/sai_v1.yaml
4848
- common_patches/tim/v2/l5.yaml
4949
- ../peripherals/tim/v2/ccm.yaml
50+
- common_patches/adc_common_group_name.yaml

‎devices/stm32l562.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,4 @@ _include:
221221
- ../peripherals/tim/v2/ccm.yaml
222222
- common_patches/rtc/alarm.yaml
223223
- common_patches/rtc/tamp_bkpr.yaml
224+
- common_patches/adc_common_group_name.yaml

0 commit comments

Comments
 (0)