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

STM: Add usart v2

Browse Source
This commit is contained in:
Thales Fragoso
2021-07-04 15:40:33 -03:00
committed by Bob McWhirter
parent f32caaeaaf
commit a56ddfdc04
2 changed files with 143 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
embassy-stm32/src/bdma/v1.rs
View File

@ -35,13 +35,15 @@ impl State {
static STATE: State = State::new();
#[allow(unused)]
pub(crate) async unsafe fn transfer_p2m(ch: &mut impl Channel, src: *const u8, dst: &mut [u8]) {
pub(crate) async unsafe fn transfer_p2m(
regs: pac::bdma::Ch,
state_number: usize,
src: *const u8,
dst: &mut [u8],
) {
// ndtr is max 16 bits.
assert!(dst.len() <= 0xFFFF);
let regs: pac::bdma::Ch = ch.regs();
let state_number = ch.state_num();
// Reset status
// Generate a DMB here to flush the store buffer (M7) before enabling the DMA
STATE.ch_status[state_number].store(CH_STATUS_NONE, Ordering::Release);
@ -82,13 +84,15 @@ pub(crate) async unsafe fn transfer_p2m(ch: &mut impl Channel, src: *const u8, d
}
#[allow(unused)]
pub(crate) async unsafe fn transfer_m2p(ch: &mut impl Channel, src: &[u8], dst: *mut u8) {
pub(crate) async unsafe fn transfer_m2p(
regs: pac::bdma::Ch,
state_number: usize,
src: &[u8],
dst: *mut u8,
) {
// ndtr is max 16 bits.
assert!(src.len() <= 0xFFFF);
let regs: pac::bdma::Ch = ch.regs();
let state_number = ch.state_num();
// Reset status
// Generate a DMB here to flush the store buffer (M7) before enabling the DMA
STATE.ch_status[state_number].store(CH_STATUS_NONE, Ordering::Release);
@ -168,7 +172,7 @@ pub(crate) mod sealed {
}
pub trait Channel {
fn dma_regs() -> &'static pac::bdma::Dma;
fn dma_regs() -> pac::bdma::Dma;
fn state_num(&self) -> usize;
@ -199,8 +203,8 @@ macro_rules! impl_dma_channel {
impl Channel for crate::peripherals::$channel_peri {}
impl sealed::Channel for crate::peripherals::$channel_peri {
#[inline]
fn dma_regs() -> &'static pac::bdma::Dma {
&crate::pac::$dma_peri
fn dma_regs() -> pac::bdma::Dma {
crate::pac::$dma_peri
}
fn state_num(&self) -> usize {
@ -222,7 +226,11 @@ macro_rules! impl_dma_channel {
where
T: 'a,
{
unsafe { transfer_m2p(self, buf, dst) }
use sealed::Channel as _Channel;
let state_num = self.state_num();
let regs = self.regs();
unsafe { transfer_m2p(regs, state_num, buf, dst) }
}
}
@ -240,7 +248,11 @@ macro_rules! impl_dma_channel {
where
T: 'a,
{
unsafe { transfer_p2m(self, src, buf) }
use sealed::Channel as _Channel;
let state_num = self.state_num();
let regs = self.regs();
unsafe { transfer_p2m(regs, state_num, src, buf) }
}
}
};