aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf/src/twim.rs
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-07-23 14:00:19 +0200
committerDario Nieuwenhuis <[email protected]>2022-07-23 14:00:19 +0200
commit4901c34d9c4cd326ab9bca02dd099a663da2567f (patch)
tree8225afebb595fb10c1d67148c0d19b7b732853da /embassy-nrf/src/twim.rs
parent8a9d2f59af004902d3978a2922843833b98bcce0 (diff)
Rename Unborrowed -> PeripheralRef, Unborrow -> Peripheral
Diffstat (limited to 'embassy-nrf/src/twim.rs')
-rw-r--r--embassy-nrf/src/twim.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs
index 2088691b2..7699d2a71 100644
--- a/embassy-nrf/src/twim.rs
+++ b/embassy-nrf/src/twim.rs
@@ -16,14 +16,14 @@ use core::task::Poll;
16use embassy::time::{Duration, Instant}; 16use embassy::time::{Duration, Instant};
17use embassy::waitqueue::AtomicWaker; 17use embassy::waitqueue::AtomicWaker;
18use embassy_embedded_hal::SetConfig; 18use embassy_embedded_hal::SetConfig;
19use embassy_hal_common::unborrow; 19use embassy_hal_common::into_ref;
20use futures::future::poll_fn; 20use futures::future::poll_fn;
21 21
22use crate::chip::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE}; 22use crate::chip::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE};
23use crate::gpio::Pin as GpioPin; 23use crate::gpio::Pin as GpioPin;
24use crate::interrupt::{Interrupt, InterruptExt}; 24use crate::interrupt::{Interrupt, InterruptExt};
25use crate::util::{slice_in_ram, slice_in_ram_or}; 25use crate::util::{slice_in_ram, slice_in_ram_or};
26use crate::{gpio, pac, Unborrow}; 26use crate::{gpio, pac, Peripheral};
27 27
28#[derive(Clone, Copy)] 28#[derive(Clone, Copy)]
29pub enum Frequency { 29pub enum Frequency {
@@ -80,13 +80,13 @@ pub struct Twim<'d, T: Instance> {
80 80
81impl<'d, T: Instance> Twim<'d, T> { 81impl<'d, T: Instance> Twim<'d, T> {
82 pub fn new( 82 pub fn new(
83 _twim: impl Unborrow<Target = T> + 'd, 83 _twim: impl Peripheral<P = T> + 'd,
84 irq: impl Unborrow<Target = T::Interrupt> + 'd, 84 irq: impl Peripheral<P = T::Interrupt> + 'd,
85 sda: impl Unborrow<Target = impl GpioPin> + 'd, 85 sda: impl Peripheral<P = impl GpioPin> + 'd,
86 scl: impl Unborrow<Target = impl GpioPin> + 'd, 86 scl: impl Peripheral<P = impl GpioPin> + 'd,
87 config: Config, 87 config: Config,
88 ) -> Self { 88 ) -> Self {
89 unborrow!(irq, sda, scl); 89 into_ref!(irq, sda, scl);
90 90
91 let r = T::regs(); 91 let r = T::regs();
92 92
@@ -707,7 +707,7 @@ pub(crate) mod sealed {
707 } 707 }
708} 708}
709 709
710pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static { 710pub trait Instance: Peripheral<P = Self> + sealed::Instance + 'static {
711 type Interrupt: Interrupt; 711 type Interrupt: Interrupt;
712} 712}
713 713