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

fix warnings

Browse Source
This commit is contained in:
JuliDi 2023-06-27 22:33:17 +02:00
parent 60c54107ce
commit 9c81d63155
No known key found for this signature in database
GPG Key ID: E1E90AE563D09D63
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
embassy-stm32/src/dac/mod.rs
View File

@ -5,7 +5,6 @@ use core::marker::PhantomData;
use embassy_hal_common::{into_ref, PeripheralRef}; use embassy_hal_common::{into_ref, PeripheralRef};
use crate::dma::{Transfer, TransferOptions};
use crate::pac::dac; use crate::pac::dac;
use crate::rcc::RccPeripheral; use crate::rcc::RccPeripheral;
use crate::{peripherals, Peripheral}; use crate::{peripherals, Peripheral};
@ -195,6 +194,7 @@ pub struct Dac<'d, T: Instance, TxCh1, TxCh2> {
pub struct DacCh1<'d, T: Instance, Tx> { pub struct DacCh1<'d, T: Instance, Tx> {
/// To consume T /// To consume T
_peri: PeripheralRef<'d, T>, _peri: PeripheralRef<'d, T>,
#[allow(unused)] // For chips whose DMA is not (yet) supported
dma: PeripheralRef<'d, Tx>, dma: PeripheralRef<'d, Tx>,
} }
@ -204,6 +204,7 @@ pub struct DacCh1<'d, T: Instance, Tx> {
pub struct DacCh2<'d, T: Instance, Tx> { pub struct DacCh2<'d, T: Instance, Tx> {
/// Instead of PeripheralRef to consume T /// Instead of PeripheralRef to consume T
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
#[allow(unused)] // For chips whose DMA is not (yet) supported
dma: PeripheralRef<'d, Tx>, dma: PeripheralRef<'d, Tx>,
} }
@ -265,7 +266,7 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
let tx_request = self.dma.request(); let tx_request = self.dma.request();
let dma_channel = &self.dma; let dma_channel = &self.dma;
let tx_options = TransferOptions { let tx_options = crate::dma::TransferOptions {
circular, circular,
half_transfer_ir: false, half_transfer_ir: false,
complete_transfer_ir: !circular, complete_transfer_ir: !circular,
@ -275,7 +276,7 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
// Initiate the correct type of DMA transfer depending on what data is passed // Initiate the correct type of DMA transfer depending on what data is passed
let tx_f = match data { let tx_f = match data {
ValueArray::Bit8(buf) => unsafe { ValueArray::Bit8(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -284,7 +285,7 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
) )
}, },
ValueArray::Bit12Left(buf) => unsafe { ValueArray::Bit12Left(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -293,7 +294,7 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
) )
}, },
ValueArray::Bit12Right(buf) => unsafe { ValueArray::Bit12Right(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -377,7 +378,7 @@ impl<'d, T: Instance, Tx> DacCh2<'d, T, Tx> {
let tx_request = self.dma.request(); let tx_request = self.dma.request();
let dma_channel = &self.dma; let dma_channel = &self.dma;
let tx_options = TransferOptions { let tx_options = crate::dma::TransferOptions {
circular, circular,
half_transfer_ir: false, half_transfer_ir: false,
complete_transfer_ir: !circular, complete_transfer_ir: !circular,
@ -387,7 +388,7 @@ impl<'d, T: Instance, Tx> DacCh2<'d, T, Tx> {
// Initiate the correct type of DMA transfer depending on what data is passed // Initiate the correct type of DMA transfer depending on what data is passed
let tx_f = match data { let tx_f = match data {
ValueArray::Bit8(buf) => unsafe { ValueArray::Bit8(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -396,7 +397,7 @@ impl<'d, T: Instance, Tx> DacCh2<'d, T, Tx> {
) )
}, },
ValueArray::Bit12Left(buf) => unsafe { ValueArray::Bit12Left(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -405,7 +406,7 @@ impl<'d, T: Instance, Tx> DacCh2<'d, T, Tx> {
) )
}, },
ValueArray::Bit12Right(buf) => unsafe { ValueArray::Bit12Right(buf) => unsafe {
Transfer::new_write( crate::dma::Transfer::new_write(
dma_channel, dma_channel,
tx_request, tx_request,
buf, buf,
@ -526,7 +527,7 @@ foreach_peripheral!(
#[cfg(rcc_h7)] #[cfg(rcc_h7)]
impl crate::rcc::sealed::RccPeripheral for peripherals::$inst { impl crate::rcc::sealed::RccPeripheral for peripherals::$inst {
fn frequency() -> crate::time::Hertz { fn frequency() -> crate::time::Hertz {
critical_section::with(|_| crate::rcc::get_freqs().apb1) critical_section::with(|_| unsafe { crate::rcc::get_freqs().apb1 })
} }
fn reset() { fn reset() {