From d2cbf27f04b534e1be7a02c28f7ed680ca91b0e5 Mon Sep 17 00:00:00 2001
From: Albin Hedman <albin9604@gmail.com>
Date: Mon, 18 Dec 2023 22:43:41 +0100
Subject: [PATCH] Fix compilation errors on cat 2 devices

---
 src/dma/stream.rs   | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/dma/transfer.rs | 17 +++++++++++++++--
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/dma/stream.rs b/src/dma/stream.rs
index e306c9f8..d166b48e 100644
--- a/src/dma/stream.rs
+++ b/src/dma/stream.rs
@@ -577,3 +577,46 @@ dma_stream!(
         dmamux => c7cr, c15cr,
     ),
 );
+
+// Cat 2 devices
+#[cfg(any(feature = "stm32g431", feature = "stm32g441",))]
+dma_stream!(
+    // Note: the field names start from one, unlike the RM where they start from
+    // zero. May need updating if it gets fixed upstream.
+    (
+        Stream0, 0,
+        regs => ccr1, cpar1, cmar1, cndtr1,
+        fields => tcif1, htif1, teif1, gif1, tcif1, htif1, teif1, gif1,
+        dmamux => c0cr, c6cr,
+    ),
+    (
+        Stream1, 1,
+        regs => ccr2, cpar2, cmar2, cndtr2,
+        fields => tcif2, htif2, teif2, gif2, tcif2, htif2, teif2, gif2,
+        dmamux => c1cr, c7cr,
+    ),
+    (
+        Stream2, 2,
+        regs => ccr3, cpar3, cmar3, cndtr3,
+        fields => tcif3, htif3, teif3, gif3, tcif3, htif3, teif3, gif3,
+        dmamux => c2cr, c8cr,
+    ),
+    (
+        Stream3, 3,
+        regs => ccr4, cpar4, cmar4, cndtr4,
+        fields => tcif4, htif4, teif4, gif4, tcif4, htif4, teif4, gif4,
+        dmamux => c3cr, c9cr,
+    ),
+    (
+        Stream4, 4,
+        regs => ccr5, cpar5, cmar5, cndtr5,
+        fields => tcif5, htif5, teif5, gif5, tcif5, htif5, teif5, gif5,
+        dmamux => c4cr, c10cr,
+    ),
+    (
+        Stream5, 5,
+        regs => ccr6, cpar6, cmar6, cndtr6,
+        fields => tcif6, htif6, teif6, gif6, tcif6, htif6, teif6, gif6,
+        dmamux => c5cr, c11cr,
+    ),
+);
diff --git a/src/dma/transfer.rs b/src/dma/transfer.rs
index ab9d1efb..bf287076 100644
--- a/src/dma/transfer.rs
+++ b/src/dma/transfer.rs
@@ -691,14 +691,27 @@ transfer_constructor!(
     (DMA1, Stream3),
     (DMA1, Stream4),
     (DMA1, Stream5),
-    (DMA1, Stream6),
-    (DMA1, Stream7),
     (DMA2, Stream0),
     (DMA2, Stream1),
     (DMA2, Stream2),
     (DMA2, Stream3),
     (DMA2, Stream4),
     (DMA2, Stream5),
+);
+
+// Cat 3 and 4 devices
+#[cfg(any(
+    feature = "stm32g471",
+    feature = "stm32g473",
+    feature = "stm32g474",
+    feature = "stm32g483",
+    feature = "stm32g484",
+    feature = "stm32g491",
+    feature = "stm32g49a",
+))]
+transfer_constructor!(
+    (DMA1, Stream6),
+    (DMA1, Stream7),
     (DMA2, Stream6),
     (DMA2, Stream7),
 );