From bc60d30aebf63c25f1357f3ff934e03c95be23ea Mon Sep 17 00:00:00 2001 From: Rahix Date: Thu, 18 Mar 2021 20:21:06 +0100 Subject: [PATCH] all: Drop unnecessary access mode patches Due to a change in atdf2svd [1], all these access mode patches are no longer required - they are now translated correctly from the vendor source file. Drop all patches which no longer change the output (the code before and after this change is equivalent when using the new atdf2svd). [1]: https://github.com/Rahix/atdf2svd/commit/a189276b3540b647fab832946edf0acf39730a0e --- patch/atmega1280.yaml | 1 - patch/atmega168.yaml | 1 - patch/atmega2560.yaml | 1 - patch/atmega328p.yaml | 6 ------ patch/atmega328pb.yaml | 11 ----------- patch/atmega32u4.yaml | 1 - patch/atmega48p.yaml | 1 - patch/atmega64.yaml | 1 - patch/atmega644.yaml | 1 - patch/atmega8.yaml | 3 --- patch/atmega8u2.yaml | 1 - patch/attiny84.yaml | 11 ----------- patch/attiny841.yaml | 7 ------- patch/attiny85.yaml | 12 ------------ patch/attiny861.yaml | 1 - patch/attiny88.yaml | 16 ---------------- patch/common/ac.yaml | 3 --- patch/common/adc.yaml | 5 +---- patch/common/port.yaml | 7 ------- patch/common/spi.yaml | 5 ----- patch/common/tiny/exint.yaml | 3 --- patch/common/tiny/usi.yaml | 3 --- patch/common/twi.yaml | 3 --- patch/common/usart.yaml | 3 --- patch/common/wdt.yaml | 4 ---- patch/timer/dev/16bit-tiny861-tc0.yaml | 4 ---- patch/timer/dev/16bit.yaml | 4 ---- patch/timer/dev/8bit-async.yaml | 4 ---- patch/timer/dev/8bit-tiny85-tc1.yaml | 2 -- patch/timer/dev/8bit.yaml | 4 ---- 30 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 patch/common/port.yaml diff --git a/patch/atmega1280.yaml b/patch/atmega1280.yaml index 325049aa50909632197cc773298b3629a8b2232e..0b746f38dcf06fae3b93a38a8e6a66d0466471d3 100644 --- a/patch/atmega1280.yaml +++ b/patch/atmega1280.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega1280.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega168.yaml b/patch/atmega168.yaml index 80a3ca24b621b3038706233790a68f6ea86aae9d..ef8f6a69757ad0393858155785f6492210b40dd7 100644 --- a/patch/atmega168.yaml +++ b/patch/atmega168.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega168.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega2560.yaml b/patch/atmega2560.yaml index 026fcb9b046c17995651787811737fd3249bc4bf..d415104ccf73efbbf7f801e126086395b19b5001 100644 --- a/patch/atmega2560.yaml +++ b/patch/atmega2560.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega2560.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega328p.yaml b/patch/atmega328p.yaml index fe001af2f9b6aa47a1f7c9fa24c28926b54fa1fd..9ae1eff24b76b45c47c4a46187666c27d7a0886c 100644 --- a/patch/atmega328p.yaml +++ b/patch/atmega328p.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega328p.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" @@ -11,11 +10,6 @@ _include: - "timer/atmega328p.yaml" -CPU: - _modify: - PRR: - access: read-write - EXINT: EIMSK: _modify: diff --git a/patch/atmega328pb.yaml b/patch/atmega328pb.yaml index 8c756e8a5cf205abb837966f14404cdb3b2d33c4..db9c1d2bfc345689ee29867d8faab79cc74e0bfe 100644 --- a/patch/atmega328pb.yaml +++ b/patch/atmega328pb.yaml @@ -32,9 +32,6 @@ TWI1: # messes up the patch when using `common/ac.yaml`, so the # ac has to be patched here instead. AC: - _modify: - ACSR: - access: read-write ACSR: _modify: ACIS: @@ -50,7 +47,6 @@ AC: _include: - "common/adc.yaml" - - "common/port.yaml" - "common/usart.yaml" - "common/spi.yaml" - "common/twi.yaml" @@ -58,13 +54,6 @@ _include: - "timer/atmega328pb.yaml" -CPU: - _modify: - PRR0: - access: read-write - PRR1: - access: read-write - EXINT: EIMSK: _modify: diff --git a/patch/atmega32u4.yaml b/patch/atmega32u4.yaml index 2b30bc82b2242c9f3e5058d903542ba7f1f2b6f0..704d35d54c369757ed21d8939a84ff0ef0de7ecf 100644 --- a/patch/atmega32u4.yaml +++ b/patch/atmega32u4.yaml @@ -4,7 +4,6 @@ _include: - "common/ac.yaml" - "common/adc.yaml" - "common/pll.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega48p.yaml b/patch/atmega48p.yaml index a2f8dfe6c440e3776441c09a7a6984b0f457783d..315930271597ff659f399fb03b89f9d39dbfbed5 100644 --- a/patch/atmega48p.yaml +++ b/patch/atmega48p.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega48p.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega64.yaml b/patch/atmega64.yaml index 56edf71c41471a1ebd1736bf0e929e347af08256..f010c54799d777cf0b44b214d7965b4750552d03 100644 --- a/patch/atmega64.yaml +++ b/patch/atmega64.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega64.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/usart.yaml" diff --git a/patch/atmega644.yaml b/patch/atmega644.yaml index 3580551e6efed773dd5a3d1bde629db6596795a1..84843bcc083588226de6f5d66eab564f84f50c43 100644 --- a/patch/atmega644.yaml +++ b/patch/atmega644.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega644.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/usart.yaml" diff --git a/patch/atmega8.yaml b/patch/atmega8.yaml index 358c4dc206b5602583c5e9478c1b077040fc4f9c..64451a712b3b8ead1d1c9c22ce2d47ba9c2b5bf8 100644 --- a/patch/atmega8.yaml +++ b/patch/atmega8.yaml @@ -1,4 +1 @@ _svd: ../svd/atmega8.svd - -_include: - - "common/port.yaml" diff --git a/patch/atmega8u2.yaml b/patch/atmega8u2.yaml index 568fc78b74eac70bd1f01a05cd87acfaeb720121..7209b7f5ccaa6f55926be1e788e06180507ee404 100644 --- a/patch/atmega8u2.yaml +++ b/patch/atmega8u2.yaml @@ -3,7 +3,6 @@ _svd: ../svd/atmega8u2.svd _include: - "common/ac.yaml" - "common/eeprom.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/usart.yaml" - "common/wdt.yaml" diff --git a/patch/attiny84.yaml b/patch/attiny84.yaml index fb6180b5a05d6c00b608b10ed6182467843bf995..be7786609694f1f59034ba599a4c8176f4ce3f90 100644 --- a/patch/attiny84.yaml +++ b/patch/attiny84.yaml @@ -3,7 +3,6 @@ _svd: ../svd/attiny84.svd _include: - "common/ac.yaml" - "common/eeprom.yaml" - - "common/port.yaml" - "common/wdt.yaml" - "common/tiny/exint.yaml" @@ -28,9 +27,6 @@ AC: bitWidth: 1 access: read-write ADC: - _modify: - ADCSRA: - access: read-write ADCSRA: ADPS: _replace_enum: @@ -142,9 +138,6 @@ ADC: AREF: [1, "External Voltage Reference at AREF pin, Internal Voltage Reference turned off"] INTERNAL: [2, "Internal 1.1V Voltage Reference"] CPU: - _modify: - OSCCAL: - access: read-write CLKPR: CLKPS: _replace_enum: @@ -169,7 +162,3 @@ CPU: bitOffset: 2 bitWidth: 1 access: read-write - OSCCAL: - _modify: - CAL: - access: read-write diff --git a/patch/attiny841.yaml b/patch/attiny841.yaml index eea56863eb78231ff4462bb36f95150ec3fe97db..a0ca460d06c25efb76309bc75f02028188aed326 100644 --- a/patch/attiny841.yaml +++ b/patch/attiny841.yaml @@ -2,7 +2,6 @@ _svd: ../svd/attiny841.svd _include: - "common/ac.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/usart.yaml" - "common/wdt.yaml" @@ -10,9 +9,6 @@ _include: - "timer/attiny841.yaml" ADC: - _modify: - ADCSRA: - access: read-write ADCSRA: ADPS: _replace_enum: @@ -39,9 +35,6 @@ ADC: # slave, so it doesn't have many of the fields that the common peripheral # does, like TWWC, TWAMR, and TWPS TWI*: - _modify: - TWCR: - access: read-write TWSCRB: TWAA: _replace_enum: diff --git a/patch/attiny85.yaml b/patch/attiny85.yaml index 4bd842d3b0136fa30820d1654a91c2b9c7bb44cd..17163069c63c6e7528d955ad2025d406bb9abf12 100644 --- a/patch/attiny85.yaml +++ b/patch/attiny85.yaml @@ -3,7 +3,6 @@ _svd: ../svd/attiny85.svd _include: - "common/ac.yaml" - "common/eeprom.yaml" - - "common/port.yaml" - "common/wdt.yaml" - "common/tiny/exint.yaml" @@ -69,13 +68,6 @@ ADC: INTERNAL: [2, "Internal Voltage Reference (1.1V when REFS2 is cleared, 2.56V when REFS2 is set) without external bypass"] INTERNAL_BYPASS: [3, "Internal 2.56V Voltage Reference with external bypass capacitor at AREF pin (REFS2 must be set)"] CPU: - _modify: - CLKPR: - access: read-write - MCUSR: - access: read-write - OSCCAL: - access: read-write CLKPR: CLKPS: _replace_enum: @@ -102,10 +94,6 @@ CPU: bitOffset: 2 bitWidth: 1 access: read-write - OSCCAL: - _modify: - CAL: - access: read-write PLLCSR: _modify: PLOCK: diff --git a/patch/attiny861.yaml b/patch/attiny861.yaml index a0c200096b23ab35a238ffe6b99ee7b1dff137ba..f44ad52b05083a49c26cbabd7748e8fc53574583 100644 --- a/patch/attiny861.yaml +++ b/patch/attiny861.yaml @@ -3,7 +3,6 @@ _svd: ../svd/attiny861.svd _include: - "common/ac.yaml" - "common/adc.yaml" - - "common/port.yaml" - "common/tiny/usi.yaml" - "common/wdt.yaml" diff --git a/patch/attiny88.yaml b/patch/attiny88.yaml index 909a94fc01df4f2af816b67dde9a95304a8cd59b..46c777b311a17516255c2c701fe9ff8baa3c69fd 100644 --- a/patch/attiny88.yaml +++ b/patch/attiny88.yaml @@ -3,7 +3,6 @@ _svd: ../svd/attiny88.svd _include: - "common/ac.yaml" - "common/eeprom.yaml" - - "common/port.yaml" - "common/spi.yaml" - "common/twi.yaml" - "common/wdt.yaml" @@ -54,15 +53,6 @@ ADC: TC1_OVF: [6, "Timer/Counter1 Overflow"] TC1_CE: [7, "Timer/Counter1 Capture Event"] CPU: - _modify: - CLKPR: - access: read-write - OSCCAL: - access: read-write - PORTCR: - access: read-write - PRR: - access: read-write CLKPR: CLKPS: _replace_enum: @@ -92,9 +82,3 @@ EXINT: _modify: PCICR: description: "Pin Change Interrupt Control Register" -PORTA: - _modify: - PORTA: - access: read-write - DDRA: - access: read-write diff --git a/patch/common/ac.yaml b/patch/common/ac.yaml index c8cf890265cca407d3704f633f71ec0bdfa51d39..f7a6454c89191b9457c659ad5d933d5773ca07a9 100644 --- a/patch/common/ac.yaml +++ b/patch/common/ac.yaml @@ -5,9 +5,6 @@ # - Make just the Output field of ACSR read-only # - Fix the "Interrupt Mode Select" enumerated values AC: - _modify: - ACSR,ACSR?A,ACSRA: - access: read-write ACSR,ACSR?A,ACSRA: _modify: ACIS,ACIS?: diff --git a/patch/common/adc.yaml b/patch/common/adc.yaml index e362f943d15ea7aa90d1440cc99d1b99a62a2c6b..aab3b95f86782a4230ceadfed7cc49d9a7a6e0ae 100644 --- a/patch/common/adc.yaml +++ b/patch/common/adc.yaml @@ -2,9 +2,6 @@ # # - Make the control-register actually writable ADC: - _modify: - ADCSRA: - access: read-write ADCSRA: ADPS: _replace_enum: @@ -20,4 +17,4 @@ ADC: _replace_enum: AREF: [0, "Aref Internal Vref turned off"] AVCC: [1, "AVcc with external capacitor at AREF pin"] - INTERNAL: [3, "Internal 1.1V Voltage Reference with external capacitor at AREF pin"] \ No newline at end of file + INTERNAL: [3, "Internal 1.1V Voltage Reference with external capacitor at AREF pin"] diff --git a/patch/common/port.yaml b/patch/common/port.yaml deleted file mode 100644 index 2a00bbd33604afb3504fd05a6983dcdd423e0594..0000000000000000000000000000000000000000 --- a/patch/common/port.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Patches for I/O Ports -# -# - Make the PINx register writable (toggles the corresponding PORTx bit) -PORT?: - _modify: - PIN?: - access: read-write diff --git a/patch/common/spi.yaml b/patch/common/spi.yaml index 5a2dded2bd88a1db2ae6ed09ab60d499ad4b53c0..01c5fdb5997810f1b0f46e7fb2ffb9440f8a1d81 100644 --- a/patch/common/spi.yaml +++ b/patch/common/spi.yaml @@ -2,17 +2,12 @@ # # Fix the SP2X status register bit to have write access SPI*: - _modify: - SPSR: - access: read-write SPSR: _modify: SPIF: access: read-only WCOL: access: read-only - SPI2X: - access: read-write SPCR: SPR: _replace_enum: diff --git a/patch/common/tiny/exint.yaml b/patch/common/tiny/exint.yaml index e4498125d59568f71c6f8f483f03da7d3ed63627..3d585e34029a961b0932472f7c584e4499e0f31b 100644 --- a/patch/common/tiny/exint.yaml +++ b/patch/common/tiny/exint.yaml @@ -1,7 +1,4 @@ EXINT: - _modify: - GIFR: - access: read-write MCUCR: _delete: ISC??: diff --git a/patch/common/tiny/usi.yaml b/patch/common/tiny/usi.yaml index a094171d95b106936105c6527301fdac231f6a95..8bf211428706b0eff4d7b6dd42935093f2331d6c 100644 --- a/patch/common/tiny/usi.yaml +++ b/patch/common/tiny/usi.yaml @@ -1,7 +1,4 @@ USI: - _modify: - USISR: - access: read-write USICR: _modify: USICLK: diff --git a/patch/common/twi.yaml b/patch/common/twi.yaml index 4750a2a40a9a745ca11bfba22ba293a188164f97..a8a7b273d1c0c7d480a3ed1c4e643c19ec20fe04 100644 --- a/patch/common/twi.yaml +++ b/patch/common/twi.yaml @@ -5,9 +5,6 @@ # - Fix the "Slave Address Mask" description # - Fix the Prescaler enumerated values TWI*: - _modify: - TWCR: - access: read-write TWCR: _modify: TWWC: diff --git a/patch/common/usart.yaml b/patch/common/usart.yaml index 59f2cbfa77e73b252f323d469c7558b04250de58..c18f0fa34dc0cf3706ed7937c1bd59d510437716 100644 --- a/patch/common/usart.yaml +++ b/patch/common/usart.yaml @@ -1,7 +1,4 @@ USART?: - _modify: - UCSR?A: - access: read-write UCSR?A: _modify: UPE?: diff --git a/patch/common/wdt.yaml b/patch/common/wdt.yaml index e4ba06dfc37156efdf888f23bff399bfb44d919e..578b0a49a64fbd8b0850fe00b6bf43b2d1381cff 100644 --- a/patch/common/wdt.yaml +++ b/patch/common/wdt.yaml @@ -3,14 +3,10 @@ # The control register has a different name between ATmega and # ATtiny (WDTCSR vs WDTCR). # -# - Make the control register read-write # - Remove the overlapping WDP (Prescaler) field and replace # it with two separate fields. # - TODO: See if svd2rust would support some kind of mask? WDT: - _modify: - WDTCSR,WDTCR: - access: read-write WDTCSR,WDTCR: _delete: - WDP diff --git a/patch/timer/dev/16bit-tiny861-tc0.yaml b/patch/timer/dev/16bit-tiny861-tc0.yaml index 21050b7d08eddfd68a1dc3da5de77f7b1e1ac4ba..1f62bb42c8cb776cac2f38a6c5e928ec0f09acea 100644 --- a/patch/timer/dev/16bit-tiny861-tc0.yaml +++ b/patch/timer/dev/16bit-tiny861-tc0.yaml @@ -1,7 +1,3 @@ -_modify: - TIFR?: - access: read-write - TCCR?B: _modify: CS?: diff --git a/patch/timer/dev/16bit.yaml b/patch/timer/dev/16bit.yaml index d719df87497c6df02453b98d68ca9deeeca8f861..7033632ebdaf78cdeb9027f241191b699576271c 100644 --- a/patch/timer/dev/16bit.yaml +++ b/patch/timer/dev/16bit.yaml @@ -1,7 +1,3 @@ -_modify: - TIFR?: - access: read-write - TCCR?A: _modify: COM??: diff --git a/patch/timer/dev/8bit-async.yaml b/patch/timer/dev/8bit-async.yaml index f438a69ffbc6b66da5b3ed531e04c81c90fdc809..a94aa2dec669a7e86fd7cb7fcb26a97a5742bf10 100644 --- a/patch/timer/dev/8bit-async.yaml +++ b/patch/timer/dev/8bit-async.yaml @@ -1,7 +1,3 @@ -_modify: - TIFR?: - access: read-write - TCCR?A: _modify: COM?A: diff --git a/patch/timer/dev/8bit-tiny85-tc1.yaml b/patch/timer/dev/8bit-tiny85-tc1.yaml index 187a9c34f3172e4657ef55a2e96ef9cb5d20f8d5..6aba70ebcd23e2c42f32b7f4da2b16a0fa463414 100644 --- a/patch/timer/dev/8bit-tiny85-tc1.yaml +++ b/patch/timer/dev/8bit-tiny85-tc1.yaml @@ -37,8 +37,6 @@ _modify: description: "Output Compare Register B" OCR1C: description: "Output Compare Register C" - TCNT?: - access: read-write GTCCR: _modify: diff --git a/patch/timer/dev/8bit.yaml b/patch/timer/dev/8bit.yaml index 96bd141e510a13c24d3c989e7eca62b407c02435..90af00b2031103a46e663d69bb3a85c8a63e0169 100644 --- a/patch/timer/dev/8bit.yaml +++ b/patch/timer/dev/8bit.yaml @@ -1,7 +1,3 @@ -_modify: - TIFR?: - access: read-write - TCCR?A: _modify: COM?A: