aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gilbert <[email protected]>2023-09-29 21:27:15 -0500
committerTyler Gilbert <[email protected]>2023-09-29 21:27:15 -0500
commit6cdee93934f55c06c6bb6cee94f5f70ec1384220 (patch)
treefb598e57ea944798692312eee7ff011fde0cffcc
parent5c8c1b21462cae078ede1025a54b2c96b233d118 (diff)
#Issue 1974 fix more warnings treated as errors
-rw-r--r--embassy-stm32/src/rcc/f4.rs2
-rw-r--r--embassy-stm32/src/sai/mod.rs10
2 files changed, 10 insertions, 2 deletions
diff --git a/embassy-stm32/src/rcc/f4.rs b/embassy-stm32/src/rcc/f4.rs
index 17834784a..2f851cfa1 100644
--- a/embassy-stm32/src/rcc/f4.rs
+++ b/embassy-stm32/src/rcc/f4.rs
@@ -97,7 +97,7 @@ fn setup_i2s_pll(vco_in: u32, plli2s: Option<u32>) -> Option<u32> {
97} 97}
98 98
99#[cfg(not(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479)))] 99#[cfg(not(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479)))]
100fn setup_sai_pll(vco_in: u32, _pllsai: Option<u32>) -> Option<u32> { 100fn setup_sai_pll(_vco_in: u32, _pllsai: Option<u32>) -> Option<u32> {
101 None 101 None
102} 102}
103 103
diff --git a/embassy-stm32/src/sai/mod.rs b/embassy-stm32/src/sai/mod.rs
index aa996a99a..d2949e9a0 100644
--- a/embassy-stm32/src/sai/mod.rs
+++ b/embassy-stm32/src/sai/mod.rs
@@ -3,7 +3,7 @@
3use embassy_embedded_hal::SetConfig; 3use embassy_embedded_hal::SetConfig;
4use embassy_hal_internal::{into_ref, PeripheralRef}; 4use embassy_hal_internal::{into_ref, PeripheralRef};
5 5
6use crate::dma::{Channel, ReadableRingBuffer, TransferOptions, WritableRingBuffer}; 6use crate::dma::{ringbuffer, Channel, ReadableRingBuffer, TransferOptions, WritableRingBuffer};
7use crate::gpio::sealed::{AFType, Pin as _}; 7use crate::gpio::sealed::{AFType, Pin as _};
8use crate::gpio::AnyPin; 8use crate::gpio::AnyPin;
9use crate::pac::sai::{vals, Sai as Regs}; 9use crate::pac::sai::{vals, Sai as Regs};
@@ -17,6 +17,13 @@ pub use crate::dma::word;
17pub enum Error { 17pub enum Error {
18 NotATransmitter, 18 NotATransmitter,
19 NotAReceiver, 19 NotAReceiver,
20 OverrunError,
21}
22
23impl From<ringbuffer::OverrunError> for Error {
24 fn from(_: ringbuffer::OverrunError) -> Self {
25 Self::OverrunError
26 }
20} 27}
21 28
22#[derive(Copy, Clone)] 29#[derive(Copy, Clone)]
@@ -499,6 +506,7 @@ pub enum SubBlock {
499 506
500enum RingBuffer<'d, C: Channel, W: word::Word> { 507enum RingBuffer<'d, C: Channel, W: word::Word> {
501 Writable(WritableRingBuffer<'d, C, W>), 508 Writable(WritableRingBuffer<'d, C, W>),
509 #[allow(dead_code)] // remove this after implementing new_* functions for receiver
502 Readable(ReadableRingBuffer<'d, C, W>), 510 Readable(ReadableRingBuffer<'d, C, W>),
503} 511}
504 512