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

stm32/dma: rename is_stopped to is_running.

Browse Source 
Note that this does NOT invert the result of `en()` because it was
wrong before.
This commit is contained in:
Dario Nieuwenhuis 2021-12-08 01:51:39 +01:00
parent b2910558d3
commit fd2fe62b5f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,8 +155,8 @@ pac::dma_channels! {
unsafe {low_level_api::request_stop(crate::pac::$dma_peri, $channel_num);} unsafe {low_level_api::request_stop(crate::pac::$dma_peri, $channel_num);}
} }
fn is_stopped(&self) -> bool { fn is_running(&self) -> bool {
unsafe {low_level_api::is_stopped(crate::pac::$dma_peri, $channel_num)} unsafe {low_level_api::is_running(crate::pac::$dma_peri, $channel_num)}
} }
fn remaining_transfers(&mut self) -> u16 { fn remaining_transfers(&mut self) -> u16 {
unsafe {low_level_api::get_remaining_transfers(crate::pac::$dma_peri, $channel_num)} unsafe {low_level_api::get_remaining_transfers(crate::pac::$dma_peri, $channel_num)}
@ -240,7 +240,7 @@ mod low_level_api {
fence(Ordering::SeqCst); fence(Ordering::SeqCst);
} }
pub unsafe fn is_stopped(dma: pac::bdma::Dma, ch: u8) -> bool { pub unsafe fn is_running(dma: pac::bdma::Dma, ch: u8) -> bool {
let ch = dma.ch(ch as _); let ch = dma.ch(ch as _);
ch.cr().read().en() ch.cr().read().en()
} }

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

@ -149,8 +149,8 @@ pac::dma_channels! {
unsafe {low_level_api::request_stop(&crate::pac::$dma_peri, $channel_num);} unsafe {low_level_api::request_stop(&crate::pac::$dma_peri, $channel_num);}
} }
fn is_stopped(&self) -> bool { fn is_running(&self) -> bool {
unsafe {low_level_api::is_stopped(&crate::pac::$dma_peri, $channel_num)} unsafe {low_level_api::is_running(&crate::pac::$dma_peri, $channel_num)}
} }
fn remaining_transfers(&mut self) -> u16 { fn remaining_transfers(&mut self) -> u16 {
@ -240,7 +240,7 @@ mod low_level_api {
} }
/// Gets the running status of the channel /// Gets the running status of the channel
pub unsafe fn is_stopped(dma: &pac::dma::Dma, ch: u8) -> bool { pub unsafe fn is_running(dma: &pac::dma::Dma, ch: u8) -> bool {
// get a handle on the channel itself // get a handle on the channel itself
let ch = dma.st(ch as _); let ch = dma.st(ch as _);

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

@ -49,7 +49,7 @@ pub(crate) mod sealed {
fn request_stop(&mut self); fn request_stop(&mut self);
/// Returns whether this channel is active or stopped. /// Returns whether this channel is active or stopped.
fn is_stopped(&self) -> bool; fn is_running(&self) -> bool;
/// Returns the total number of remaining transfers. /// Returns the total number of remaining transfers.
fn remaining_transfers(&mut self) -> u16; fn remaining_transfers(&mut self) -> u16;
@ -173,10 +173,10 @@ mod transfers {
// TODO in the future, error checking could be added so that this function returns an error // TODO in the future, error checking could be added so that this function returns an error
if channel.is_stopped() { if channel.is_running() {
Poll::Ready(())
} else {
Poll::Pending Poll::Pending
} else {
Poll::Ready(())
} }
}) })
.await .await