From 8ef5b404f1810cc03a08391ac1927dff94aae0d2 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 7 Feb 2022 22:48:53 +0100 Subject: [PATCH] Update stm32-data --- stm32-data | 2 +- stm32-metapac-gen/src/data.rs | 33 ++++--------------------------- stm32-metapac-gen/src/lib.rs | 37 ++++++++++++++++------------------- 3 files changed, 22 insertions(+), 50 deletions(-) diff --git a/stm32-data b/stm32-data index fe221f484..b665a7292 160000 --- a/stm32-data +++ b/stm32-data @@ -1 +1 @@ -Subproject commit fe221f48442d4b6eef6dcfd04d9d4deec4402cce +Subproject commit b665a729227a4cdabad58e728f7d4c6a94454b7a diff --git a/stm32-metapac-gen/src/data.rs b/stm32-metapac-gen/src/data.rs index 56a121ffb..9bb4e191d 100644 --- a/stm32-metapac-gen/src/data.rs +++ b/stm32-metapac-gen/src/data.rs @@ -51,7 +51,7 @@ pub struct Peripheral { pub name: String, pub address: u64, #[serde(default)] - pub block: Option, + pub registers: Option, #[serde(default)] pub rcc: Option, #[serde(default)] @@ -71,11 +71,6 @@ pub struct PeripheralInterrupt { #[derive(Debug, Eq, PartialEq, Clone, Deserialize)] pub struct PeripheralRcc { pub clock: String, - pub registers: PeripheralRccRegisters, -} - -#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] -pub struct PeripheralRccRegisters { #[serde(default)] pub enable: Option, #[serde(default)] @@ -112,29 +107,9 @@ pub struct PeripheralDmaChannel { pub request: Option, } -pub struct BlockInfo { - /// usart_v1/USART -> usart - pub module: String, - /// usart_v1/USART -> v1 +#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Hash)] +pub struct PeripheralRegisters { + pub kind: String, pub version: String, - /// usart_v1/USART -> USART pub block: String, } - -impl BlockInfo { - pub fn parse(s: &str) -> Self { - let mut s = s.split('/'); - let module = s.next().unwrap(); - let block = s.next().unwrap(); - assert!(s.next().is_none()); - let mut s = module.split('_'); - let module = s.next().unwrap(); - let version = s.next().unwrap(); - assert!(s.next().is_none()); - Self { - module: module.to_string(), - version: version.to_string(), - block: block.to_string(), - } - } -} diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs index 07de4f1e2..fd8da8a6f 100644 --- a/stm32-metapac-gen/src/lib.rs +++ b/stm32-metapac-gen/src/lib.rs @@ -98,12 +98,11 @@ pub fn gen_chip( // Load DBGMCU register for chip let mut dbgmcu: Option = core.peripherals.iter().find_map(|p| { if p.name == "DBGMCU" { - p.block.as_ref().map(|block| { - let bi = BlockInfo::parse(block); + p.registers.as_ref().map(|bi| { let dbgmcu_reg_path = options .data_dir .join("registers") - .join(&format!("{}_{}.yaml", bi.module, bi.version)); + .join(&format!("{}_{}.yaml", bi.kind, bi.version)); serde_yaml::from_reader(File::open(dbgmcu_reg_path).unwrap()).unwrap() }) } else { @@ -160,18 +159,16 @@ pub fn gen_chip( interrupts: HashMap::new(), }; - if let Some(block) = &p.block { - let bi = BlockInfo::parse(block); - + if let Some(bi) = &p.registers { peripheral_counts.insert( - bi.module.clone(), - peripheral_counts.get(&bi.module).map_or(1, |v| v + 1), + bi.kind.clone(), + peripheral_counts.get(&bi.kind).map_or(1, |v| v + 1), ); for pin in &p.pins { let mut row = Vec::new(); row.push(p.name.clone()); - row.push(bi.module.clone()); + row.push(bi.kind.clone()); row.push(bi.block.clone()); row.push(pin.pin.clone()); row.push(pin.signal.clone()); @@ -184,7 +181,7 @@ pub fn gen_chip( for irq in &p.interrupts { let mut row = Vec::new(); row.push(p.name.clone()); - row.push(bi.module.clone()); + row.push(bi.kind.clone()); row.push(bi.block.clone()); row.push(irq.signal.clone()); row.push(irq.interrupt.to_ascii_uppercase()); @@ -194,7 +191,7 @@ pub fn gen_chip( for ch in &p.dma_channels { let mut row = Vec::new(); row.push(p.name.clone()); - row.push(bi.module.clone()); + row.push(bi.kind.clone()); row.push(bi.block.clone()); row.push(ch.signal.clone()); row.push(if let Some(channel) = &ch.channel { @@ -221,23 +218,23 @@ pub fn gen_chip( } let mut peripheral_row = Vec::new(); - peripheral_row.push(bi.module.clone()); + peripheral_row.push(bi.kind.clone()); peripheral_row.push(p.name.clone()); peripherals_table.push(peripheral_row); if let Some(old_version) = - peripheral_versions.insert(bi.module.clone(), bi.version.clone()) + peripheral_versions.insert(bi.kind.clone(), bi.version.clone()) { if old_version != bi.version { panic!( "Peripheral {} has multiple versions: {} and {}", - bi.module, old_version, bi.version + bi.kind, old_version, bi.version ); } } - ir_peri.block = Some(format!("{}::{}", bi.module, bi.block)); + ir_peri.block = Some(format!("{}::{}", bi.kind, bi.block)); - match bi.module.as_str() { + match bi.kind.as_str() { "gpio" => { let port_letter = p.name.chars().skip(4).next().unwrap(); assert_eq!(0, (p.address as u32 - gpio_base) % gpio_stride); @@ -265,11 +262,11 @@ pub fn gen_chip( let mut row = Vec::new(); row.push(p.name.clone()); - row.push(bi.module.clone()); + row.push(bi.kind.clone()); row.push(bi.block.clone()); row.push(clock); - for reg in [&rcc.registers.enable, &rcc.registers.reset] { + for reg in [&rcc.enable, &rcc.reset] { if let Some(reg) = reg { row.push(format!( "({}, {}, set_{})", @@ -292,11 +289,11 @@ pub fn gen_chip( for ch in &core.dma_channels { let mut row = Vec::new(); let dma_peri = core.peripherals.iter().find(|p| p.name == ch.dma).unwrap(); - let bi = BlockInfo::parse(dma_peri.block.as_ref().unwrap()); + let bi = dma_peri.registers.as_ref().unwrap(); row.push(ch.name.clone()); row.push(ch.dma.clone()); - row.push(bi.module.clone()); + row.push(bi.kind.clone()); row.push(ch.channel.to_string()); if let Some(dmamux) = &ch.dmamux { let dmamux_channel = ch.dmamux_channel.unwrap();