From 1726a5eee2820f78751d589528bb9b42a8049336 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Fri, 7 Jun 2019 21:14:58 +0200
Subject: [PATCH] atmega1280: Factor out USART into a common patch

Signed-off-by: Rahix <rahix@rahix.de>
---
 patch/atmega1280.yaml   | 46 ++-------------------------------------
 patch/atmega32u4.yaml   | 48 ++---------------------------------------
 patch/common/usart.yaml | 44 +++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 90 deletions(-)
 create mode 100644 patch/common/usart.yaml

diff --git a/patch/atmega1280.yaml b/patch/atmega1280.yaml
index 4f56f25..ec070e4 100644
--- a/patch/atmega1280.yaml
+++ b/patch/atmega1280.yaml
@@ -1,44 +1,2 @@
-USART1:
-  _modify:
-    UCSR1A:
-      access: read-write
-  UCSR1A:
-    _modify:
-      UPE1:
-        access: read-only
-      DOR1:
-        access: read-only
-      FE1:
-        access: read-only
-      UDRE1:
-        access: read-only
-      RXC1:
-        access: read-only
-  UCSR1B:
-    _modify:
-      RXB81:
-        access: read-only
-  UCSR1C:
-    UMSEL1:
-      _replace_enum:
-        USART_ASYNC: [0, "Asynchronous USART"]
-        USART_SYNC:  [1, "Synchronous USART"]
-        SPI_MASTER:  [3, "Master SPI (MSPIM)"]
-    UPM1:
-      _replace_enum:
-        DISABLED:    [0, "Disabled"]
-        PARITY_EVEN: [2, "Enabled, Even Parity"]
-        PARITY_ODD:  [3, "Enabled, Odd Parity"]
-    USBS1:
-      _replace_enum:
-        STOP1: [0, "1-bit"]
-        STOP2: [1, "2-bit"]
-    UCSZ1:
-      CHR5: [0, "Character Size: 5 bit"]
-      CHR6: [1, "Character Size: 6 bit"]
-      CHR7: [2, "Character Size: 7 bit"]
-      CHR8: [3, "Character Size: 8 bit"]
-    UCPOL1:
-      _replace_enum:
-        RISING_EDGE:  [0, "Transmit on Rising XCKn Edge, Receive on Falling XCKn Edge"]
-        FALLING_EDGE: [1, "Transmit on Falling XCKn Edge, Receive on Rising XCKn Edge"]
\ No newline at end of file
+_include:
+  - "common/usart.yaml"
diff --git a/patch/atmega32u4.yaml b/patch/atmega32u4.yaml
index df073ec..a75744a 100644
--- a/patch/atmega32u4.yaml
+++ b/patch/atmega32u4.yaml
@@ -1,51 +1,7 @@
 _include:
   - "common/ac.yaml"
   - "common/pll.yaml"
+  - "common/timer/tc0.yaml"
   - "common/twi.yaml"
+  - "common/usart.yaml"
   - "common/wdt.yaml"
-  - "common/timer/tc0.yaml"
-
-USART1:
-  _modify:
-    UCSR1A:
-      access: read-write
-  UCSR1A:
-    _modify:
-      UPE1:
-        access: read-only
-      DOR1:
-        access: read-only
-      FE1:
-        access: read-only
-      UDRE1:
-        access: read-only
-      RXC1:
-        access: read-only
-  UCSR1B:
-    _modify:
-      RXB81:
-        access: read-only
-  UCSR1C:
-    UMSEL1:
-      _replace_enum:
-        USART_ASYNC: [0, "Asynchronous USART"]
-        USART_SYNC:  [1, "Synchronous USART"]
-        SPI_MASTER:  [3, "Master SPI (MSPIM)"]
-    UPM1:
-      _replace_enum:
-        DISABLED:    [0, "Disabled"]
-        PARITY_EVEN: [2, "Enabled, Even Parity"]
-        PARITY_ODD:  [3, "Enabled, Odd Parity"]
-    USBS1:
-      _replace_enum:
-        STOP1: [0, "1-bit"]
-        STOP2: [1, "2-bit"]
-    UCSZ1:
-      CHR5: [0, "Character Size: 5 bit"]
-      CHR6: [1, "Character Size: 6 bit"]
-      CHR7: [2, "Character Size: 7 bit"]
-      CHR8: [3, "Character Size: 8 bit"]
-    UCPOL1:
-      _replace_enum:
-        RISING_EDGE:  [0, "Transmit on Rising XCKn Edge, Receive on Falling XCKn Edge"]
-        FALLING_EDGE: [1, "Transmit on Falling XCKn Edge, Receive on Rising XCKn Edge"]
diff --git a/patch/common/usart.yaml b/patch/common/usart.yaml
new file mode 100644
index 0000000..7a3d0f3
--- /dev/null
+++ b/patch/common/usart.yaml
@@ -0,0 +1,44 @@
+USART?:
+  _modify:
+    UCSR?A:
+      access: read-write
+  UCSR?A:
+    _modify:
+      UPE?:
+        access: read-only
+      DOR?:
+        access: read-only
+      FE?:
+        access: read-only
+      UDRE?:
+        access: read-only
+      RXC?:
+        access: read-only
+  UCSR?B:
+    _modify:
+      RXB8?:
+        access: read-only
+  UCSR?C:
+    UMSEL?:
+      _replace_enum:
+        USART_ASYNC: [0, "Asynchronous USART"]
+        USART_SYNC:  [1, "Synchronous USART"]
+        SPI_MASTER:  [3, "Master SPI (MSPIM)"]
+    UPM?:
+      _replace_enum:
+        DISABLED:    [0, "Disabled"]
+        PARITY_EVEN: [2, "Enabled, Even Parity"]
+        PARITY_ODD:  [3, "Enabled, Odd Parity"]
+    USBS?:
+      _replace_enum:
+        STOP1: [0, "1-bit"]
+        STOP2: [1, "2-bit"]
+    UCSZ?:
+      CHR5: [0, "Character Size: 5 bit"]
+      CHR6: [1, "Character Size: 6 bit"]
+      CHR7: [2, "Character Size: 7 bit"]
+      CHR8: [3, "Character Size: 8 bit"]
+    UCPOL?:
+      _replace_enum:
+        RISING_EDGE:  [0, "Transmit on Rising XCKn Edge, Receive on Falling XCKn Edge"]
+        FALLING_EDGE: [1, "Transmit on Falling XCKn Edge, Receive on Rising XCKn Edge"]
-- 
2.49.0