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

Fix unused field warnings

Browse Source
This commit is contained in:
Rukai 2021-05-17 20:23:04 +10:00
parent 149ddf2f29
commit 3e83acc1cb
6 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
embassy-nrf/src/buffered_uarte.rs
View File

@ -1,4 +1,5 @@
use core::cmp::min;
use core::marker::PhantomData;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{compiler_fence, Ordering};
@ -34,7 +35,7 @@ enum TxState {
}
struct State<'d, U: UarteInstance, T: TimerInstance> {
uarte: U,
phantom: PhantomData<&'d mut U>,
timer: T,
_ppi_ch1: Ppi<'d, AnyConfigurableChannel>,
_ppi_ch2: Ppi<'d, AnyConfigurableChannel>,
@ -63,7 +64,7 @@ pub struct BufferedUarte<'d, U: UarteInstance, T: TimerInstance> {
impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
/// unsafe: may not leak self or futures
pub unsafe fn new(
uarte: impl Unborrow<Target = U> + 'd,
_uarte: impl Unborrow<Target = U> + 'd,
timer: impl Unborrow<Target = T> + 'd,
ppi_ch1: impl Unborrow<Target = impl ConfigurableChannel> + 'd,
ppi_ch2: impl Unborrow<Target = impl ConfigurableChannel> + 'd,
@ -76,7 +77,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
rx_buffer: &'d mut [u8],
tx_buffer: &'d mut [u8],
) -> Self {
unborrow!(uarte, timer, ppi_ch1, ppi_ch2, irq, rxd, txd, cts, rts);
unborrow!(timer, ppi_ch1, ppi_ch2, irq, rxd, txd, cts, rts);
let r = U::regs();
let rt = timer.regs();
@ -158,7 +159,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
BufferedUarte {
inner: PeripheralMutex::new(
State {
uarte,
phantom: PhantomData,
timer,
_ppi_ch1: ppi_ch1,
_ppi_ch2: ppi_ch2,

6
embassy-nrf/src/pwm.rs
View File

@ -26,7 +26,6 @@ pub enum Prescaler {
/// Interface to the UARTE peripheral
pub struct Pwm<'d, T: Instance> {
peri: T,
phantom: PhantomData<&'d mut T>,
}
@ -41,13 +40,13 @@ impl<'d, T: Instance> Pwm<'d, T> {
/// or [`receive`](Pwm::receive).
#[allow(unused_unsafe)]
pub fn new(
pwm: impl Unborrow<Target = T> + 'd,
_pwm: impl Unborrow<Target = T> + 'd,
ch0: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
ch1: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
ch2: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
ch3: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
) -> Self {
unborrow!(pwm, ch0, ch1, ch2, ch3);
unborrow!(ch0, ch1, ch2, ch3);
let r = T::regs();
let s = T::state();
@ -97,7 +96,6 @@ impl<'d, T: Instance> Pwm<'d, T> {
r.loop_.write(|w| w.cnt().disabled());
Self {
peri: pwm,
phantom: PhantomData,
}
}

8
embassy-nrf/src/qspi.rs
View File

@ -55,14 +55,12 @@ impl Default for Config {
}
pub struct Qspi<'d, T: Instance> {
peri: T,
irq: T::Interrupt,
phantom: PhantomData<&'d mut T>,
}
impl<'d, T: Instance> Qspi<'d, T> {
pub fn new(
qspi: impl Unborrow<Target = T> + 'd,
_qspi: impl Unborrow<Target = T> + 'd,
irq: impl Unborrow<Target = T::Interrupt> + 'd,
sck: impl Unborrow<Target = impl GpioPin> + 'd,
csn: impl Unborrow<Target = impl GpioPin> + 'd,
@ -72,7 +70,7 @@ impl<'d, T: Instance> Qspi<'d, T> {
io3: impl Unborrow<Target = impl GpioPin> + 'd,
config: Config,
) -> Self {
unborrow!(qspi, irq, sck, csn, io0, io1, io2, io3);
unborrow!(irq, sck, csn, io0, io1, io2, io3);
let r = T::regs();
@ -139,8 +137,6 @@ impl<'d, T: Instance> Qspi<'d, T> {
irq.enable();
Self {
peri: qspi,
irq,
phantom: PhantomData,
}
}

8
embassy-nrf/src/saadc.rs
View File

@ -32,8 +32,6 @@ pub enum Error {}
/// One-shot saadc. Continuous sample mode TODO.
pub struct OneShot<'d, T: PositivePin> {
peri: peripherals::SAADC,
positive_pin: T,
irq: interrupt::SAADC,
phantom: PhantomData<(&'d mut peripherals::SAADC, &'d mut T)>,
}
@ -71,12 +69,12 @@ impl Default for Config {
impl<'d, T: PositivePin> OneShot<'d, T> {
pub fn new(
saadc: impl Unborrow<Target = peripherals::SAADC> + 'd,
_saadc: impl Unborrow<Target = peripherals::SAADC> + 'd,
irq: impl Unborrow<Target = interrupt::SAADC> + 'd,
positive_pin: impl Unborrow<Target = T> + 'd,
config: Config,
) -> Self {
unborrow!(saadc, irq, positive_pin);
unborrow!(irq, positive_pin);
let r = unsafe { &*SAADC::ptr() };
@ -118,8 +116,6 @@ impl<'d, T: PositivePin> OneShot<'d, T> {
r.intenclr.write(|w| unsafe { w.bits(0x003F_FFFF) });
Self {
peri: saadc,
positive_pin,
irq,
phantom: PhantomData,
}

8
embassy-nrf/src/spim.rs
View File

@ -30,8 +30,6 @@ pub enum Error {
}
pub struct Spim<'d, T: Instance> {
peri: T,
irq: T::Interrupt,
phantom: PhantomData<&'d mut T>,
}
@ -54,14 +52,14 @@ impl Default for Config {
impl<'d, T: Instance> Spim<'d, T> {
pub fn new(
spim: impl Unborrow<Target = T> + 'd,
_spim: impl Unborrow<Target = T> + 'd,
irq: impl Unborrow<Target = T::Interrupt> + 'd,
sck: impl Unborrow<Target = impl GpioPin> + 'd,
miso: impl Unborrow<Target = impl OptionalPin> + 'd,
mosi: impl Unborrow<Target = impl OptionalPin> + 'd,
config: Config,
) -> Self {
unborrow!(spim, irq, sck, miso, mosi);
unborrow!(irq, sck, miso, mosi);
let r = T::regs();
@ -140,8 +138,6 @@ impl<'d, T: Instance> Spim<'d, T> {
irq.enable();
Self {
peri: spim,
irq,
phantom: PhantomData,
}
}

8
embassy-nrf/src/twim.rs
View File

@ -42,20 +42,18 @@ impl Default for Config {
/// Interface to a TWIM instance.
pub struct Twim<'d, T: Instance> {
peri: T,
irq: T::Interrupt,
phantom: PhantomData<&'d mut T>,
}
impl<'d, T: Instance> Twim<'d, T> {
pub fn new(
twim: impl Unborrow<Target = T> + 'd,
_twim: impl Unborrow<Target = T> + 'd,
irq: impl Unborrow<Target = T::Interrupt> + 'd,
sda: impl Unborrow<Target = impl GpioPin> + 'd,
scl: impl Unborrow<Target = impl GpioPin> + 'd,
config: Config,
) -> Self {
unborrow!(twim, irq, sda, scl);
unborrow!(irq, sda, scl);
let r = T::regs();
@ -94,8 +92,6 @@ impl<'d, T: Instance> Twim<'d, T> {
irq.enable();
Self {
peri: twim,
irq,
phantom: PhantomData,
}
}