Prep for new stm32-data with dmamux differentiation, but not yet using.

2 files changed, 9 insertions, 2 deletions

diff --git a/stm32-data b/stm32-data
-Subproject ddd0f206e22143436230dca6d3fcfc0e02e55df
+Subproject d285fced6573703be875436409f8c83dd80ae18
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index 3cfb884ce..ff919d8bf 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -50,7 +50,7 @@ pub struct Peripheral {
     #[serde(default)]
     pub dma_channels: HashMap<String, Vec<PeripheralDmaChannel>>,
     #[serde(default)]
-    pub dma_requests: HashMap<String, u32>,
+    pub dma_requests: HashMap<String, PeripheralDmaRequest>,
 }
 
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
@@ -72,6 +72,12 @@ pub struct PeripheralDmaChannel {
     pub request: Option<u32>,
 }
 
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Hash)]
+pub struct PeripheralDmaRequest {
+    pub dmamux: String,
+    pub request: u32,
+}
+
 struct BlockInfo {
     /// usart_v1/USART -> usart
     module: String,
@@ -335,7 +341,8 @@ pub fn gen(options: Options) {
                     row.push(bi.module.clone());
                     row.push(name.clone());
                     row.push(dma_request.0.clone());
-                    row.push(dma_request.1.to_string());
+                    row.push(dma_request.1.request.to_string());
+                    // TODO add the `dmamux` column
                     dma_requests_table.push(row);
                 }