nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 06:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed DMA CI build issues.

Browse Source
This commit is contained in:
Caleb Garrett 2024-03-10 17:28:53 -04:00
parent e92094986d
commit 50a7ada0bb
1 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
embassy-stm32/src/dma/dma_bdma.rs
View File

@ -10,8 +10,7 @@ use super::ringbuffer::{DmaCtrl, OverrunError, ReadableDmaRingBuffer, WritableDm
use super::word::{Word, WordSize};
use super::{AnyChannel, Channel, Dir, Request, STATE};
use crate::interrupt::typelevel::Interrupt;
use crate::interrupt;
use crate::pac;
use crate::{interrupt, pac};
pub(crate) struct ChannelInfo {
pub(crate) dma: DmaInfo,
@ -78,6 +77,44 @@ impl Default for TransferOptions {
}
}
/// DMA request priority
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Priority {
/// Low Priority
Low,
/// Medium Priority
Medium,
/// High Priority
High,
/// Very High Priority
VeryHigh,
}
#[cfg(dma)]
impl From<Priority> for pac::dma::vals::Pl {
fn from(value: Priority) -> Self {
match value {
Priority::Low => pac::dma::vals::Pl::LOW,
Priority::Medium => pac::dma::vals::Pl::MEDIUM,
Priority::High => pac::dma::vals::Pl::HIGH,
Priority::VeryHigh => pac::dma::vals::Pl::VERYHIGH,
}
}
}
#[cfg(bdma)]
impl From<Priority> for pac::bdma::vals::Pl {
fn from(value: Priority) -> Self {
match value {
Priority::Low => pac::bdma::vals::Pl::LOW,
Priority::Medium => pac::bdma::vals::Pl::MEDIUM,
Priority::High => pac::bdma::vals::Pl::HIGH,
Priority::VeryHigh => pac::bdma::vals::Pl::VERYHIGH,
}
}
}
#[cfg(dma)]
pub use dma_only::*;
#[cfg(dma)]
@ -173,31 +210,6 @@ mod dma_only {
}
}
}
/// DMA request priority
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Priority {
/// Low Priority
Low,
/// Medium Priority
Medium,
/// High Priority
High,
/// Very High Priority
VeryHigh,
}
impl From<Priority> for vals::Pl {
fn from(value: Priority) -> Self {
match value {
Priority::Low => vals::Pl::LOW,
Priority::Medium => vals::Pl::MEDIUM,
Priority::High => vals::Pl::HIGH,
Priority::VeryHigh => vals::Pl::VERYHIGH,
}
}
}
}
#[cfg(bdma)]
@ -224,31 +236,6 @@ mod bdma_only {
}
}
}
/// DMA request priority
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Priority {
/// Low Priority
Low,
/// Medium Priority
Medium,
/// High Priority
High,
/// Very High Priority
VeryHigh,
}
impl From<Priority> for vals::Pl {
fn from(value: Priority) -> Self {
match value {
Priority::Low => vals::Pl::LOW,
Priority::Medium => vals::Pl::MEDIUM,
Priority::High => vals::Pl::HIGH,
Priority::VeryHigh => vals::Pl::VERYHIGH,
}
}
}
}
pub(crate) struct ChannelState {