From 965ca13641b62a45f8397a35ed522e9733c1cb64 Mon Sep 17 00:00:00 2001
From: Albin Hedman <albin.hedman@dectron.se>
Date: Fri, 16 May 2025 17:28:15 +0200
Subject: [PATCH] Fix DMA->DMAMUX channel mapping

---
 Cargo.toml         | 25 ++++++++++++++++---------
 src/dma/channel.rs | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a36ece64..05da015b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ version = "0.0.2"
 
 [dependencies]
 nb = "1"
-stm32g4 = { version = "0.22.0", package = "stm32g4-staging" }
+stm32g4 = { version = "0.22.0", package = "stm32g4-staging", features = ["defmt"] }
 paste = "1.0"
 fugit = "0.3.7"
 stm32-usbd = { version = "0.7.0", optional = true }
@@ -75,16 +75,17 @@ usbd-serial = "0.2.2"
 #TODO: Separate feature sets
 [features]
 default = ["rt"]
+
 rt = ["stm32g4/rt"]
 usb = ["dep:stm32-usbd"]
-stm32g431 = ["stm32g4/stm32g431"]
-stm32g441 = ["stm32g4/stm32g441"]
-stm32g473 = ["stm32g4/stm32g473", "adc3", "adc4", "adc5"]
-stm32g474 = ["stm32g4/stm32g474", "adc3", "adc4", "adc5"]
-stm32g483 = ["stm32g4/stm32g483", "adc3", "adc4", "adc5"]
-stm32g484 = ["stm32g4/stm32g484", "adc3", "adc4", "adc5"]
-stm32g491 = ["stm32g4/stm32g491", "adc3"]
-stm32g4a1 = ["stm32g4/stm32g4a1", "adc3"]
+stm32g431 = ["stm32g4/stm32g431", "cat2"]
+stm32g441 = ["stm32g4/stm32g441", "cat2"]
+stm32g473 = ["stm32g4/stm32g473", "cat3", "adc3", "adc4", "adc5"]
+stm32g474 = ["stm32g4/stm32g474", "cat3", "adc3", "adc4", "adc5"]
+stm32g483 = ["stm32g4/stm32g483", "cat3", "adc3", "adc4", "adc5"]
+stm32g484 = ["stm32g4/stm32g484", "cat3", "adc3", "adc4", "adc5"]
+stm32g491 = ["stm32g4/stm32g491", "cat4", "adc3"]
+stm32g4a1 = ["stm32g4/stm32g4a1", "cat4", "adc3"]
 log-itm = ["cortex-m-log/itm"]
 log-rtt = []
 log-semihost = ["cortex-m-log/semihosting"]
@@ -99,6 +100,12 @@ cordic = ["dep:fixed"]
 adc3 = []
 adc4 = []
 adc5 = []
+
+# Device category
+cat2 = []
+cat3 = []
+cat4 = []
+
 can = ["dep:fdcan"]
 
 [profile.dev]
diff --git a/src/dma/channel.rs b/src/dma/channel.rs
index 47e96330..12651b64 100644
--- a/src/dma/channel.rs
+++ b/src/dma/channel.rs
@@ -263,9 +263,22 @@ impl<I: Instance, const N: u8> Channel for C<I, N> {
     fn set_request_line(&mut self, request_line: u8) {
         //NOTE(unsafe) We only access the registers that belongs to the ChannelX
         let dmamux = unsafe { &*I::mux_ptr() };
+        #[cfg(feature = "cat2")]
+        let channels_per_dma = 6;
+
+        #[cfg(any(feature = "cat3", feature = "cat4"))]
+        let channels_per_dma = 8;
+
+        let mux_ch = if I::IS_DMA1 {
+            // DMA1 ch 0..=(channels_per_dma-1) are dmamux ch 0..=channels_per_dma
+            N as usize
+        } else {
+            // DMA2 ch 0..=ch(channels_per_dma-1) are dmamux ch channels_per_dma..=(2*channels_per_dma-1)
+            N as usize + channels_per_dma
+        };
         unsafe {
             dmamux
-                .ccr(N as usize)
+                .ccr(mux_ch)
                 .modify(|_, w| w.dmareq_id().bits(request_line));
         }
     }