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

Try using cfg! macro

Browse Source
This commit is contained in:
Andres Oliva 2023-10-11 23:32:40 +02:00
parent cd68f85501
commit 251d004708
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
embassy-stm32/src/i2c/v2.rs
View File

@ -755,10 +755,11 @@ impl<'d, T: Instance, TXDMA, RXDMA> I2c<'d, T, TXDMA, RXDMA> {
} }
pub fn blocking_read(&mut self, address: u8, read: &mut [u8]) -> Result<(), Error> { pub fn blocking_read(&mut self, address: u8, read: &mut [u8]) -> Result<(), Error> {
#[cfg(feature = "time")] if cfg!(feature = "time") {
self.blocking_read_timeout(address, read, self.timeout) self.blocking_read_timeout(address, read, self.timeout)
#[cfg(not(feature = "time"))] } else {
self.blocking_read_timeout(address, read, || Ok(())) self.blocking_read_timeout(address, read, || Ok(()))
}
} }
#[cfg(feature = "time")] #[cfg(feature = "time")]
@ -772,10 +773,11 @@ impl<'d, T: Instance, TXDMA, RXDMA> I2c<'d, T, TXDMA, RXDMA> {
} }
pub fn blocking_write(&mut self, address: u8, write: &[u8]) -> Result<(), Error> { pub fn blocking_write(&mut self, address: u8, write: &[u8]) -> Result<(), Error> {
#[cfg(feature = "time")] if cfg!(feature = "time") {
self.blocking_write_timeout(address, write, self.timeout) self.blocking_write_timeout(address, write, self.timeout)
#[cfg(not(feature = "time"))] } else {
self.blocking_write_timeout(address, write, || Ok(())) self.blocking_write_timeout(address, write, || Ok(()))
}
} }
#[cfg(feature = "time")] #[cfg(feature = "time")]
@ -807,10 +809,11 @@ impl<'d, T: Instance, TXDMA, RXDMA> I2c<'d, T, TXDMA, RXDMA> {
} }
pub fn blocking_write_read(&mut self, address: u8, write: &[u8], read: &mut [u8]) -> Result<(), Error> { pub fn blocking_write_read(&mut self, address: u8, write: &[u8], read: &mut [u8]) -> Result<(), Error> {
#[cfg(feature = "time")] if cfg!(feature = "time") {
self.blocking_write_read_timeout(address, write, read, self.timeout) self.blocking_write_read_timeout(address, write, read, self.timeout)
#[cfg(not(feature = "time"))] } else {
self.blocking_write_read_timeout(address, write, read, || Ok(())) self.blocking_write_read_timeout(address, write, read, || Ok(()))
}
} }
fn blocking_write_vectored_with_timeout( fn blocking_write_vectored_with_timeout(
@ -913,10 +916,11 @@ impl<'d, T: Instance, TXDMA, RXDMA> I2c<'d, T, TXDMA, RXDMA> {
} }
pub fn blocking_write_vectored(&mut self, address: u8, write: &[&[u8]]) -> Result<(), Error> { pub fn blocking_write_vectored(&mut self, address: u8, write: &[&[u8]]) -> Result<(), Error> {
#[cfg(feature = "time")] if cfg!(feature = "time") {
self.blocking_write_vectored_timeout(address, write, self.timeout) self.blocking_write_vectored_timeout(address, write, self.timeout)
#[cfg(not(feature = "time"))] } else {
self.blocking_write_vectored_timeout(address, write, || Ok(())) self.blocking_write_vectored_timeout(address, write, || Ok(()))
}
} }
} }