max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate more rows in the interrupts! table.

Browse Source 
Adjust DMA/BDMA to use the new style.
This commit is contained in:
Bob McWhirter 2021-07-27 12:52:01 -04:00
parent 9fec792a6a
commit b910551c9a
3 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-stm32/src/dma/bdma.rs
View File

@ -242,7 +242,7 @@ pac::dma_channels! {
} }
pac::interrupts! { pac::interrupts! {
(BDMA, $irq:ident) => { ($peri:ident, bdma, $block:ident, $signal_name:ident, $irq:ident) => {
#[crate::interrupt] #[crate::interrupt]
unsafe fn $irq () { unsafe fn $irq () {
on_irq() on_irq()

2
embassy-stm32/src/dma/dma.rs
View File

@ -248,7 +248,7 @@ pac::dma_channels! {
} }
pac::interrupts! { pac::interrupts! {
(DMA, $irq:ident) => { ($peri:ident, dma, $block:ident, $signal_name:ident, $irq:ident) => {
#[crate::interrupt] #[crate::interrupt]
unsafe fn $irq () { unsafe fn $irq () {
on_irq() on_irq()

34
stm32-metapac-gen/src/lib.rs
View File

@ -50,6 +50,8 @@ pub struct Peripheral {
pub pins: Vec<Pin>, pub pins: Vec<Pin>,
#[serde(default)] #[serde(default)]
pub dma_channels: HashMap<String, Vec<PeripheralDmaChannel>>, pub dma_channels: HashMap<String, Vec<PeripheralDmaChannel>>,
#[serde(default)]
pub interrupts: HashMap<String, String>
} }
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)] #[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
@ -306,9 +308,6 @@ pub fn gen(options: Options) {
} }
} }
let mut has_bdma = false;
let mut has_dma = false;
for (name, p) in &core.peripherals { for (name, p) in &core.peripherals {
let captures = number_suffix_re.captures(&name).unwrap(); let captures = number_suffix_re.captures(&name).unwrap();
let root_peri_name = captures.get(1).unwrap().as_str().to_string(); let root_peri_name = captures.get(1).unwrap().as_str().to_string();
@ -328,12 +327,6 @@ pub fn gen(options: Options) {
if let Some(block) = &p.block { if let Some(block) = &p.block {
let bi = BlockInfo::parse(block); let bi = BlockInfo::parse(block);
if bi.module == "bdma" {
has_bdma = true
} else if bi.module == "dma" {
has_dma = true
}
peripheral_counts.insert( peripheral_counts.insert(
bi.module.clone(), bi.module.clone(),
peripheral_counts.get(&bi.module).map_or(1, |v| v + 1), peripheral_counts.get(&bi.module).map_or(1, |v| v + 1),
@ -352,6 +345,16 @@ pub fn gen(options: Options) {
peripheral_pins_table.push(row); peripheral_pins_table.push(row);
} }
for (signal, irq_name) in &p.interrupts {
let mut row = Vec::new();
row.push(name.clone());
row.push(bi.module.clone());
row.push(bi.block.clone());
row.push( signal.clone() );
row.push( irq_name.to_ascii_uppercase() );
interrupt_table.push(row)
}
for (request, dma_channels) in &p.dma_channels { for (request, dma_channels) in &p.dma_channels {
for channel in dma_channels.iter() { for channel in dma_channels.iter() {
let mut row = Vec::new(); let mut row = Vec::new();
@ -553,19 +556,6 @@ pub fn gen(options: Options) {
interrupt_table.push(vec![name.clone()]); interrupt_table.push(vec![name.clone()]);
if name.starts_with("DMA1_") || name.starts_with("DMA2_") || name.contains("_DMA") {
if has_dma {
interrupt_table.push(vec!["DMA".to_string(), name.clone()]);
} else if has_bdma {
interrupt_table.push(vec!["BDMA".to_string(), name.clone()]);
}
}
if name.starts_with("BDMA_") || name.starts_with("BDMA1_") || name.starts_with("BDMA2_")
{
interrupt_table.push(vec!["BDMA".to_string(), name.clone()]);
}
if name.contains("EXTI") { if name.contains("EXTI") {
interrupt_table.push(vec!["EXTI".to_string(), name.clone()]); interrupt_table.push(vec!["EXTI".to_string(), name.clone()]);
} }