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

stm32/dma: Remove channel index tracking

Browse Source
This commit is contained in:
Grant Miller
2022-10-18 23:28:39 -05:00
parent fb53d74c57
commit 62eb675a3f
5 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,10 @@ pub(crate) unsafe fn init() {
}
foreach_dma_channel! {
($channel_peri:ident, BDMA1, bdma, $channel_num:expr, $index:expr, $dmamux:tt) => {
($channel_peri:ident, BDMA1, bdma, $channel_num:expr, $dmamux:tt) => {
// BDMA1 in H7 doesn't use DMAMUX, which breaks
};
($channel_peri:ident, $dma_peri:ident, bdma, $channel_num:expr, $index:expr, $dmamux:tt) => {
($channel_peri:ident, $dma_peri:ident, bdma, $channel_num:expr, $dmamux:tt) => {
impl crate::peripherals::$channel_peri {
fn waker() -> &'static AtomicWaker {
static WAKER: AtomicWaker = AtomicWaker::new();

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

@ -49,7 +49,7 @@ pub(crate) unsafe fn init() {
}
foreach_dma_channel! {
($channel_peri:ident, $dma_peri:ident, dma, $channel_num:expr, $index:expr, $dmamux:tt) => {
($channel_peri:ident, $dma_peri:ident, dma, $channel_num:expr, $dmamux:tt) => {
impl crate::peripherals::$channel_peri {
fn waker() -> &'static AtomicWaker {
static WAKER: AtomicWaker = AtomicWaker::new();

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

@ -31,7 +31,7 @@ pub trait MuxChannel: sealed::MuxChannel + super::Channel {
}
foreach_dma_channel! {
($channel_peri:ident, $dma_peri:ident, $version:ident, $channel_num:expr, $index:expr, {dmamux: $dmamux:ident, dmamux_channel: $dmamux_channel:expr}) => {
($channel_peri:ident, $dma_peri:ident, $version:ident, $channel_num:expr, {dmamux: $dmamux:ident, dmamux_channel: $dmamux_channel:expr}) => {
impl sealed::MuxChannel for peripherals::$channel_peri {
const DMAMUX_CH_NUM: u8 = $dmamux_channel;
const DMAMUX_REGS: pac::dmamux::Dmamux = pac::$dmamux;

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

@ -29,7 +29,7 @@ pub(crate) unsafe fn init() {
}
foreach_dma_channel! {
($channel_peri:ident, $dma_peri:ident, gpdma, $channel_num:expr, $index:expr, $dmamux:tt) => {
($channel_peri:ident, $dma_peri:ident, gpdma, $channel_num:expr, $dmamux:tt) => {
impl crate::peripherals::$channel_peri {
fn waker() -> &'static AtomicWaker {
static WAKER: AtomicWaker = AtomicWaker::new();