NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update stm32-data

Browse source
This commit is contained in:
Dario Nieuwenhuis 2022-02-07 22:48:53 +01:00
parent f50f3f0a73
commit 8ef5b404f1
3 changed files with 22 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stm32-data

@ -1 +1 @@
Subproject commit fe221f48442d4b6eef6dcfd04d9d4deec4402cce Subproject commit b665a729227a4cdabad58e728f7d4c6a94454b7a

33
stm32-metapac-gen/src/data.rs
View file

@ -51,7 +51,7 @@ pub struct Peripheral {
pub name: String, pub name: String,
pub address: u64, pub address: u64,
#[serde(default)] #[serde(default)]
pub block: Option<String>, pub registers: Option<PeripheralRegisters>,
#[serde(default)] #[serde(default)]
pub rcc: Option<PeripheralRcc>, pub rcc: Option<PeripheralRcc>,
#[serde(default)] #[serde(default)]
@ -71,11 +71,6 @@ pub struct PeripheralInterrupt {
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] #[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct PeripheralRcc { pub struct PeripheralRcc {
pub clock: String, pub clock: String,
pub registers: PeripheralRccRegisters,
}
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
pub struct PeripheralRccRegisters {
#[serde(default)] #[serde(default)]
pub enable: Option<PeripheralRccRegister>, pub enable: Option<PeripheralRccRegister>,
#[serde(default)] #[serde(default)]
@ -112,29 +107,9 @@ pub struct PeripheralDmaChannel {
pub request: Option<u32>, pub request: Option<u32>,
} }
pub struct BlockInfo { #[derive(Debug, Eq, PartialEq, Clone, Deserialize, Hash)]
/// usart_v1/USART -> usart pub struct PeripheralRegisters {
pub module: String, pub kind: String,
/// usart_v1/USART -> v1
pub version: String, pub version: String,
/// usart_v1/USART -> USART
pub block: String, 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(),
}
}
}

37
stm32-metapac-gen/src/lib.rs
View file

@ -98,12 +98,11 @@ pub fn gen_chip(
// Load DBGMCU register for chip // Load DBGMCU register for chip
let mut dbgmcu: Option<ir::IR> = core.peripherals.iter().find_map(|p| { let mut dbgmcu: Option<ir::IR> = core.peripherals.iter().find_map(|p| {
if p.name == "DBGMCU" { if p.name == "DBGMCU" {
p.block.as_ref().map(|block| { p.registers.as_ref().map(|bi| {
let bi = BlockInfo::parse(block);
let dbgmcu_reg_path = options let dbgmcu_reg_path = options
.data_dir .data_dir
.join("registers") .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() serde_yaml::from_reader(File::open(dbgmcu_reg_path).unwrap()).unwrap()
}) })
} else { } else {
@ -160,18 +159,16 @@ pub fn gen_chip(
interrupts: HashMap::new(), interrupts: HashMap::new(),
}; };
if let Some(block) = &p.block { if let Some(bi) = &p.registers {
let bi = BlockInfo::parse(block);
peripheral_counts.insert( peripheral_counts.insert(
bi.module.clone(), bi.kind.clone(),
peripheral_counts.get(&bi.module).map_or(1, |v| v + 1), peripheral_counts.get(&bi.kind).map_or(1, |v| v + 1),
); );
for pin in &p.pins { for pin in &p.pins {
let mut row = Vec::new(); let mut row = Vec::new();
row.push(p.name.clone()); row.push(p.name.clone());
row.push(bi.module.clone()); row.push(bi.kind.clone());
row.push(bi.block.clone()); row.push(bi.block.clone());
row.push(pin.pin.clone()); row.push(pin.pin.clone());
row.push(pin.signal.clone()); row.push(pin.signal.clone());
@ -184,7 +181,7 @@ pub fn gen_chip(
for irq in &p.interrupts { for irq in &p.interrupts {
let mut row = Vec::new(); let mut row = Vec::new();
row.push(p.name.clone()); row.push(p.name.clone());
row.push(bi.module.clone()); row.push(bi.kind.clone());
row.push(bi.block.clone()); row.push(bi.block.clone());
row.push(irq.signal.clone()); row.push(irq.signal.clone());
row.push(irq.interrupt.to_ascii_uppercase()); row.push(irq.interrupt.to_ascii_uppercase());
@ -194,7 +191,7 @@ pub fn gen_chip(
for ch in &p.dma_channels { for ch in &p.dma_channels {
let mut row = Vec::new(); let mut row = Vec::new();
row.push(p.name.clone()); row.push(p.name.clone());
row.push(bi.module.clone()); row.push(bi.kind.clone());
row.push(bi.block.clone()); row.push(bi.block.clone());
row.push(ch.signal.clone()); row.push(ch.signal.clone());
row.push(if let Some(channel) = &ch.channel { row.push(if let Some(channel) = &ch.channel {
@ -221,23 +218,23 @@ pub fn gen_chip(
} }
let mut peripheral_row = Vec::new(); let mut peripheral_row = Vec::new();
peripheral_row.push(bi.module.clone()); peripheral_row.push(bi.kind.clone());
peripheral_row.push(p.name.clone()); peripheral_row.push(p.name.clone());
peripherals_table.push(peripheral_row); peripherals_table.push(peripheral_row);
if let Some(old_version) = 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 { if old_version != bi.version {
panic!( panic!(
"Peripheral {} has multiple versions: {} and {}", "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" => { "gpio" => {
let port_letter = p.name.chars().skip(4).next().unwrap(); let port_letter = p.name.chars().skip(4).next().unwrap();
assert_eq!(0, (p.address as u32 - gpio_base) % gpio_stride); assert_eq!(0, (p.address as u32 - gpio_base) % gpio_stride);
@ -265,11 +262,11 @@ pub fn gen_chip(
let mut row = Vec::new(); let mut row = Vec::new();
row.push(p.name.clone()); row.push(p.name.clone());
row.push(bi.module.clone()); row.push(bi.kind.clone());
row.push(bi.block.clone()); row.push(bi.block.clone());
row.push(clock); row.push(clock);
for reg in [&rcc.registers.enable, &rcc.registers.reset] { for reg in [&rcc.enable, &rcc.reset] {
if let Some(reg) = reg { if let Some(reg) = reg {
row.push(format!( row.push(format!(
"({}, {}, set_{})", "({}, {}, set_{})",
@ -292,11 +289,11 @@ pub fn gen_chip(
for ch in &core.dma_channels { for ch in &core.dma_channels {
let mut row = Vec::new(); let mut row = Vec::new();
let dma_peri = core.peripherals.iter().find(|p| p.name == ch.dma).unwrap(); 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.name.clone());
row.push(ch.dma.clone()); row.push(ch.dma.clone());
row.push(bi.module.clone()); row.push(bi.kind.clone());
row.push(ch.channel.to_string()); row.push(ch.channel.to_string());
if let Some(dmamux) = &ch.dmamux { if let Some(dmamux) = &ch.dmamux {
let dmamux_channel = ch.dmamux_channel.unwrap(); let dmamux_channel = ch.dmamux_channel.unwrap();