diff --git a/stm32-data b/stm32-data index ddd0f206..d285fced 160000 --- a/stm32-data +++ b/stm32-data @@ -1 +1 @@ -Subproject commit ddd0f206e22143436230dca6d3fcfc0e02e55dfd +Subproject commit d285fced6573703be875436409f8c83dd80ae183 diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs index 3cfb884c..ff919d8b 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>, #[serde(default)] - pub dma_requests: HashMap, + pub dma_requests: HashMap, } #[derive(Debug, Eq, PartialEq, Clone, Deserialize)] @@ -72,6 +72,12 @@ pub struct PeripheralDmaChannel { pub request: Option, } +#[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); }