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

Rename Unborrowed -> PeripheralRef, Unborrow -> Peripheral

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-07-23 14:00:19 +02:00
parent 8a9d2f59af
commit 4901c34d9c
62 changed files with 970 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-lora/src/stm32wl/mod.rs
View File

@ -3,7 +3,7 @@ use core::future::Future;
use core::mem::MaybeUninit;
use embassy::channel::signal::Signal;
use embassy_hal_common::{unborrow, Unborrowed};
use embassy_hal_common::{into_ref, PeripheralRef};
use embassy_stm32::dma::NoDma;
use embassy_stm32::gpio::{AnyPin, Output};
use embassy_stm32::interrupt::{InterruptExt, SUBGHZ_RADIO};
@ -12,7 +12,7 @@ use embassy_stm32::subghz::{
LoRaSyncWord, Ocp, PaConfig, PaSel, PacketType, RampTime, RegMode, RfFreq, SpreadingFactor as SF, StandbyClk,
Status, SubGhz, TcxoMode, TcxoTrim, Timeout, TxParams,
};
use embassy_stm32::Unborrow;
use embassy_stm32::Peripheral;
use lorawan_device::async_device::radio::{Bandwidth, PhyRxTx, RfConfig, RxQuality, SpreadingFactor, TxConfig};
use lorawan_device::async_device::Timings;
@ -46,7 +46,7 @@ impl<'d> SubGhzState<'d> {
/// The radio peripheral keeping the radio state and owning the radio IRQ.
pub struct SubGhzRadio<'d> {
state: *mut StateInner<'d>,
_irq: Unborrowed<'d, SUBGHZ_RADIO>,
_irq: PeripheralRef<'d, SUBGHZ_RADIO>,
}
impl<'d> SubGhzRadio<'d> {
@ -58,9 +58,9 @@ impl<'d> SubGhzRadio<'d> {
state: &'d mut SubGhzState<'d>,
radio: SubGhz<'d, NoDma, NoDma>,
switch: RadioSwitch<'d>,
irq: impl Unborrow<Target = SUBGHZ_RADIO> + 'd,
irq: impl Peripheral<P = SUBGHZ_RADIO> + 'd,
) -> Self {
unborrow!(irq);
into_ref!(irq);
let mut inner = StateInner { radio, switch };
inner.radio.reset();