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

Move regs trait implementation into generated pac

Browse Source 
This allows handling devices that don't have DMA2
This commit is contained in:
Ulf Lilleengen 2021-05-19 10:42:10 +02:00 committed by Dario Nieuwenhuis
parent 0cd3236fa3
commit 9fa5a2920f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-stm32/gen.py
View File

@ -151,7 +151,7 @@ for chip in chips.values():
for ch_num in range(8): for ch_num in range(8):
channel = f'{name}_CH{ch_num}' channel = f'{name}_CH{ch_num}'
peripheral_names.append(channel) peripheral_names.append(channel)
f.write(f'impl_dma_channel!({channel}, {dma_num}, {ch_num});') f.write(f'impl_dma_channel!({name}, {channel}, {dma_num}, {ch_num});')
if peri['block'] == 'sdmmc_v2/SDMMC': if peri['block'] == 'sdmmc_v2/SDMMC':
f.write(f'impl_sdmmc!({name});') f.write(f'impl_sdmmc!({name});')

14
embassy-stm32/src/dma/mod.rs
View File

@ -20,26 +20,24 @@ pub(crate) mod sealed {
fn ch_num(&self) -> u8 { fn ch_num(&self) -> u8 {
self.num() % 8 self.num() % 8
} }
fn regs(&self) -> pac::dma::Dma;
fn regs(&self) -> pac::dma::Dma {
match self.dma_num() {
0 => pac::DMA1,
_ => pac::DMA2,
}
}
} }
} }
pub trait Channel: sealed::Channel + Sized {} pub trait Channel: sealed::Channel + Sized {}
macro_rules! impl_dma_channel { macro_rules! impl_dma_channel {
($type:ident, $dma_num:expr, $ch_num:expr) => { ($name:ident, $type:ident, $dma_num:expr, $ch_num:expr) => {
impl crate::dma::Channel for peripherals::$type {} impl crate::dma::Channel for peripherals::$type {}
impl crate::dma::sealed::Channel for peripherals::$type { impl crate::dma::sealed::Channel for peripherals::$type {
#[inline] #[inline]
fn num(&self) -> u8 { fn num(&self) -> u8 {
$dma_num * 8 + $ch_num $dma_num * 8 + $ch_num
} }
fn regs(&self) -> dma::Dma {
$name
}
} }
}; };
} }