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

nrf/uarte: update BufferedUarte to new APi

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2021-03-28 22:41:45 +02:00
parent 00e5f30352
commit 3a18373828
4 changed files with 172 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
embassy-nrf-examples/src/bin/buffered_uart.rs
View File

@@ -7,54 +7,49 @@
#[path = "../example_common.rs"] #[path = "../example_common.rs"]
mod example_common; mod example_common;
use core::mem;
use embassy_nrf::gpio::NoPin;
use example_common::*; use example_common::*;
use cortex_m_rt::entry; use cortex_m_rt::entry;
use defmt::panic; use defmt::panic;
use futures::pin_mut; use futures::pin_mut;
use nrf52840_hal as hal; use nrf52840_hal::clocks;
use nrf52840_hal::gpio;
use embassy::executor::{task, Executor}; use embassy::executor::{task, Executor};
use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
use embassy::util::Forever; use embassy::util::{Forever, Steal};
use embassy_nrf::buffered_uarte; use embassy_nrf::{buffered_uarte::BufferedUarte, interrupt, peripherals, rtc, uarte, Peripherals};
use embassy_nrf::interrupt;
static mut TX_BUFFER: [u8; 4096] = [0; 4096];
static mut RX_BUFFER: [u8; 4096] = [0; 4096];
#[task] #[task]
async fn run() { async fn run() {
let p = unwrap!(embassy_nrf::pac::Peripherals::take()); let p = unsafe { Peripherals::steal() };
let port0 = gpio::p0::Parts::new(p.P0); let mut config = uarte::Config::default();
config.parity = uarte::Parity::EXCLUDED;
config.baudrate = uarte::Baudrate::BAUD115200;
let pins = buffered_uarte::Pins { let mut tx_buffer = [0u8; 4096];
rxd: port0.p0_08.into_floating_input().degrade(), let mut rx_buffer = [0u8; 4096];
txd: port0
.p0_06
.into_push_pull_output(gpio::Level::Low)
.degrade(),
cts: None,
rts: None,
};
let ppi = hal::ppi::Parts::new(p.PPI);
let irq = interrupt::take!(UARTE0_UART0); let irq = interrupt::take!(UARTE0_UART0);
let u = buffered_uarte::BufferedUarte::new( let u = unsafe {
p.UARTE0, BufferedUarte::new(
p.TIMER0, p.UARTE0,
ppi.ppi0, p.TIMER0,
ppi.ppi1, p.PPI_CH0,
irq, p.PPI_CH1,
unsafe { &mut RX_BUFFER }, irq,
unsafe { &mut TX_BUFFER }, p.P0_08,
pins, p.P0_06,
buffered_uarte::Parity::EXCLUDED, NoPin,
buffered_uarte::Baudrate::BAUD115200, NoPin,
); config,
&mut rx_buffer,
&mut tx_buffer,
)
};
pin_mut!(u); pin_mut!(u);
info!("uarte initialized!"); info!("uarte initialized!");
@@ -80,13 +75,30 @@ async fn run() {
} }
} }
static RTC: Forever<rtc::RTC<peripherals::RTC1>> = Forever::new();
static ALARM: Forever<rtc::Alarm<peripherals::RTC1>> = Forever::new();
static EXECUTOR: Forever<Executor> = Forever::new(); static EXECUTOR: Forever<Executor> = Forever::new();
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
info!("Hello World!"); info!("Hello World!");
let p = unwrap!(embassy_nrf::Peripherals::take());
clocks::Clocks::new(unsafe { mem::transmute(()) })
.enable_ext_hfosc()
.set_lfclk_src_external(clocks::LfOscConfiguration::NoExternalNoBypass)
.start_lfclk();
let rtc = RTC.put(rtc::RTC::new(p.RTC1, interrupt::take!(RTC1)));
rtc.start();
unsafe { embassy::time::set_clock(rtc) };
let alarm = ALARM.put(rtc.alarm0());
let executor = EXECUTOR.put(Executor::new()); let executor = EXECUTOR.put(Executor::new());
executor.set_alarm(alarm);
executor.run(|spawner| { executor.run(|spawner| {
unwrap!(spawner.spawn(run())); unwrap!(spawner.spawn(run()));
}); });

16
embassy-nrf/Cargo.toml
View File

@@ -11,11 +11,11 @@ defmt-info = [ ]
defmt-warn = [ ] defmt-warn = [ ]
defmt-error = [ ] defmt-error = [ ]
52810 = ["nrf52810-pac", "nrf52810-hal"] 52810 = ["nrf52810-pac"]
52811 = ["nrf52811-pac"] #, "nrf52811-hal"] 52811 = ["nrf52811-pac"]
52832 = ["nrf52832-pac", "nrf52832-hal"] 52832 = ["nrf52832-pac"]
52833 = ["nrf52833-pac", "nrf52833-hal"] 52833 = ["nrf52833-pac"]
52840 = ["nrf52840-pac", "nrf52840-hal"] 52840 = ["nrf52840-pac"]
[dependencies] [dependencies]
@@ -36,9 +36,3 @@ nrf52811-pac = { version = "0.9.1", optional = true }
nrf52832-pac = { version = "0.9.0", optional = true } nrf52832-pac = { version = "0.9.0", optional = true }
nrf52833-pac = { version = "0.9.0", optional = true } nrf52833-pac = { version = "0.9.0", optional = true }
nrf52840-pac = { version = "0.9.0", optional = true } nrf52840-pac = { version = "0.9.0", optional = true }
nrf52810-hal = { version = "0.12.1", optional = true }
#nrf52811-hal = { version = "0.12.1", optional = true } # doesn't exist yet
nrf52832-hal = { version = "0.12.1", optional = true }
nrf52833-hal = { version = "0.12.1", optional = true }
nrf52840-hal = { version = "0.12.1", optional = true }

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

@@ -1,30 +1,24 @@
//! HAL interface to the UARTE peripheral
//!
//! See product specification:
//!
//! - nrf52832: Section 35
//! - nrf52840: Section 6.34
use core::cmp::min; use core::cmp::min;
use core::mem; use core::mem;
use core::ops::Deref;
use core::pin::Pin; use core::pin::Pin;
use core::sync::atomic::{compiler_fence, Ordering}; use core::sync::atomic::{compiler_fence, Ordering};
use core::task::{Context, Poll}; use core::task::{Context, Poll};
use embassy::interrupt::InterruptExt; use embassy::interrupt::InterruptExt;
use embassy::io::{AsyncBufRead, AsyncWrite, Result}; use embassy::io::{AsyncBufRead, AsyncWrite, Result};
use embassy::util::WakerRegistration; use embassy::util::{PeripheralBorrow, WakerRegistration};
use embassy_extras::low_power_wait_until;
use embassy_extras::peripheral::{PeripheralMutex, PeripheralState}; use embassy_extras::peripheral::{PeripheralMutex, PeripheralState};
use embassy_extras::ring_buffer::RingBuffer; use embassy_extras::ring_buffer::RingBuffer;
use embedded_hal::digital::v2::OutputPin; use embassy_extras::{low_power_wait_until, unborrow};
use crate::fmt::*; use crate::fmt::{panic, *};
use crate::hal::ppi::ConfigurablePpi; use crate::gpio::sealed::Pin as _;
use crate::interrupt::{self, Interrupt}; use crate::gpio::{OptionalPin as GpioOptionalPin, Pin as GpioPin};
use crate::pac; use crate::pac;
use crate::ppi::{AnyConfigurableChannel, ConfigurableChannel, Event, Ppi, Task};
use crate::timer::Instance as TimerInstance;
use crate::uarte::{Config, Instance as UarteInstance};
// Re-export SVD variants to allow user to directly set values // Re-export SVD variants to allow user to directly set values
pub use crate::hal::uarte::Pins;
pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity}; pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity};
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]
@@ -39,17 +33,17 @@ enum TxState {
Transmitting(usize), Transmitting(usize),
} }
struct State<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> { struct State<'d, U: UarteInstance, T: TimerInstance> {
uarte: U, uarte: U,
timer: T, timer: T,
ppi_channel_1: P1, _ppi_ch1: Ppi<'d, AnyConfigurableChannel>,
ppi_channel_2: P2, _ppi_ch2: Ppi<'d, AnyConfigurableChannel>,
rx: RingBuffer<'a>, rx: RingBuffer<'d>,
rx_state: RxState, rx_state: RxState,
rx_waker: WakerRegistration, rx_waker: WakerRegistration,
tx: RingBuffer<'a>, tx: RingBuffer<'d>,
tx_state: TxState, tx_state: TxState,
tx_waker: WakerRegistration, tx_waker: WakerRegistration,
} }
@@ -62,115 +56,112 @@ struct State<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: Configu
/// are disabled before using `Uarte`. See product specification: /// are disabled before using `Uarte`. See product specification:
/// - nrf52832: Section 15.2 /// - nrf52832: Section 15.2
/// - nrf52840: Section 6.1.2 /// - nrf52840: Section 6.1.2
pub struct BufferedUarte< pub struct BufferedUarte<'d, U: UarteInstance, T: TimerInstance> {
'a, inner: PeripheralMutex<State<'d, U, T>>,
U: Instance,
T: TimerInstance,
P1: ConfigurablePpi,
P2: ConfigurablePpi,
> {
inner: PeripheralMutex<State<'a, U, T, P1, P2>>,
} }
impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
BufferedUarte<'a, U, T, P1, P2> /// unsafe: may not leak self or futures
{ pub unsafe fn new(
pub fn new( uarte: impl PeripheralBorrow<Target = U> + 'd,
uarte: U, timer: impl PeripheralBorrow<Target = T> + 'd,
timer: T, ppi_ch1: impl PeripheralBorrow<Target = impl ConfigurableChannel> + 'd,
mut ppi_channel_1: P1, ppi_ch2: impl PeripheralBorrow<Target = impl ConfigurableChannel> + 'd,
mut ppi_channel_2: P2, irq: impl PeripheralBorrow<Target = U::Interrupt> + 'd,
irq: U::Interrupt, rxd: impl PeripheralBorrow<Target = impl GpioPin> + 'd,
rx_buffer: &'a mut [u8], txd: impl PeripheralBorrow<Target = impl GpioPin> + 'd,
tx_buffer: &'a mut [u8], cts: impl PeripheralBorrow<Target = impl GpioOptionalPin> + 'd,
mut pins: Pins, rts: impl PeripheralBorrow<Target = impl GpioOptionalPin> + 'd,
parity: Parity, config: Config,
baudrate: Baudrate, rx_buffer: &'d mut [u8],
tx_buffer: &'d mut [u8],
) -> Self { ) -> Self {
// Select pins unborrow!(uarte, timer, ppi_ch1, ppi_ch2, irq, rxd, txd, cts, rts);
uarte.psel.rxd.write(|w| {
unsafe { w.bits(pins.rxd.psel_bits()) };
w.connect().connected()
});
pins.txd.set_high().unwrap();
uarte.psel.txd.write(|w| {
unsafe { w.bits(pins.txd.psel_bits()) };
w.connect().connected()
});
// Optional pins let r = uarte.regs();
uarte.psel.cts.write(|w| { let rt = timer.regs();
if let Some(ref pin) = pins.cts {
unsafe { w.bits(pin.psel_bits()) };
w.connect().connected()
} else {
w.connect().disconnected()
}
});
uarte.psel.rts.write(|w| { rxd.conf().write(|w| w.input().connect().drive().h0h1());
if let Some(ref pin) = pins.rts { r.psel.rxd.write(|w| unsafe { w.bits(rxd.psel_bits()) });
unsafe { w.bits(pin.psel_bits()) };
w.connect().connected()
} else {
w.connect().disconnected()
}
});
// Enable UARTE instance txd.set_high();
uarte.enable.write(|w| w.enable().enabled()); txd.conf().write(|w| w.dir().output().drive().h0h1());
r.psel.txd.write(|w| unsafe { w.bits(txd.psel_bits()) });
// Enable interrupts if let Some(pin) = rts.pin_mut() {
uarte.intenset.write(|w| w.endrx().set().endtx().set()); pin.set_high();
pin.conf().write(|w| w.dir().output().drive().h0h1());
}
r.psel.cts.write(|w| unsafe { w.bits(cts.psel_bits()) });
if let Some(pin) = cts.pin_mut() {
pin.conf().write(|w| w.input().connect().drive().h0h1());
}
r.psel.rts.write(|w| unsafe { w.bits(rts.psel_bits()) });
r.baudrate.write(|w| w.baudrate().variant(config.baudrate));
r.config.write(|w| w.parity().variant(config.parity));
// Configure // Configure
let hardware_flow_control = pins.rts.is_some() && pins.cts.is_some(); let hardware_flow_control = match (rts.pin().is_some(), cts.pin().is_some()) {
uarte (false, false) => false,
.config (true, true) => true,
.write(|w| w.hwfc().bit(hardware_flow_control).parity().variant(parity)); _ => panic!("RTS and CTS pins must be either both set or none set."),
};
r.config.write(|w| {
w.hwfc().bit(hardware_flow_control);
w.parity().variant(config.parity);
w
});
r.baudrate.write(|w| w.baudrate().variant(config.baudrate));
// Configure frequency // Enable interrupts
uarte.baudrate.write(|w| w.baudrate().variant(baudrate)); r.intenset.write(|w| w.endrx().set().endtx().set());
// Disable the irq, let the Registration enable it when everything is set up. // Disable the irq, let the Registration enable it when everything is set up.
irq.disable(); irq.disable();
irq.pend(); irq.pend();
// Enable UARTE instance
r.enable.write(|w| w.enable().enabled());
// BAUDRATE register values are `baudrate * 2^32 / 16000000` // BAUDRATE register values are `baudrate * 2^32 / 16000000`
// source: https://devzone.nordicsemi.com/f/nordic-q-a/391/uart-baudrate-register-values // source: https://devzone.nordicsemi.com/f/nordic-q-a/391/uart-baudrate-register-values
// //
// We want to stop RX if line is idle for 2 bytes worth of time // We want to stop RX if line is idle for 2 bytes worth of time
// That is 20 bits (each byte is 1 start bit + 8 data bits + 1 stop bit) // That is 20 bits (each byte is 1 start bit + 8 data bits + 1 stop bit)
// This gives us the amount of 16M ticks for 20 bits. // This gives us the amount of 16M ticks for 20 bits.
let timeout = 0x8000_0000 / (baudrate as u32 / 40); let timeout = 0x8000_0000 / (config.baudrate as u32 / 40);
timer.tasks_stop.write(|w| unsafe { w.bits(1) }); rt.tasks_stop.write(|w| unsafe { w.bits(1) });
timer.bitmode.write(|w| w.bitmode()._32bit()); rt.bitmode.write(|w| w.bitmode()._32bit());
timer.prescaler.write(|w| unsafe { w.prescaler().bits(0) }); rt.prescaler.write(|w| unsafe { w.prescaler().bits(0) });
timer.cc[0].write(|w| unsafe { w.bits(timeout) }); rt.cc[0].write(|w| unsafe { w.bits(timeout) });
timer.mode.write(|w| w.mode().timer()); rt.mode.write(|w| w.mode().timer());
timer.shorts.write(|w| { rt.shorts.write(|w| {
w.compare0_clear().set_bit(); w.compare0_clear().set_bit();
w.compare0_stop().set_bit(); w.compare0_stop().set_bit();
w w
}); });
ppi_channel_1.set_event_endpoint(&uarte.events_rxdrdy); let mut ppi_ch1 = Ppi::new(ppi_ch1.degrade_configurable());
ppi_channel_1.set_task_endpoint(&timer.tasks_clear); ppi_ch1.set_event(Event::from_reg(&r.events_rxdrdy));
ppi_channel_1.set_fork_task_endpoint(&timer.tasks_start); ppi_ch1.set_task(Task::from_reg(&rt.tasks_clear));
ppi_channel_1.enable(); ppi_ch1.set_fork_task(Task::from_reg(&rt.tasks_start));
ppi_ch1.enable();
ppi_channel_2.set_event_endpoint(&timer.events_compare[0]); let mut ppi_ch2 = Ppi::new(ppi_ch2.degrade_configurable());
ppi_channel_2.set_task_endpoint(&uarte.tasks_stoprx); ppi_ch2.set_event(Event::from_reg(&rt.events_compare[0]));
ppi_channel_2.enable(); ppi_ch2.set_task(Task::from_reg(&r.tasks_stoprx));
ppi_ch2.enable();
BufferedUarte { BufferedUarte {
inner: PeripheralMutex::new( inner: PeripheralMutex::new(
State { State {
uarte, uarte,
timer, timer,
ppi_channel_1, _ppi_ch1: ppi_ch1,
ppi_channel_2, _ppi_ch2: ppi_ch2,
rx: RingBuffer::new(rx_buffer), rx: RingBuffer::new(rx_buffer),
rx_state: RxState::Idle, rx_state: RxState::Idle,
@@ -187,25 +178,23 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
pub fn set_baudrate(self: Pin<&mut Self>, baudrate: Baudrate) { pub fn set_baudrate(self: Pin<&mut Self>, baudrate: Baudrate) {
self.inner().with(|state, _irq| { self.inner().with(|state, _irq| {
let timeout = 0x8000_0000 / (baudrate as u32 / 40); let r = state.uarte.regs();
state.timer.cc[0].write(|w| unsafe { w.bits(timeout) }); let rt = state.timer.regs();
state.timer.tasks_clear.write(|w| unsafe { w.bits(1) });
state let timeout = 0x8000_0000 / (baudrate as u32 / 40);
.uarte rt.cc[0].write(|w| unsafe { w.bits(timeout) });
.baudrate rt.tasks_clear.write(|w| unsafe { w.bits(1) });
.write(|w| w.baudrate().variant(baudrate));
r.baudrate.write(|w| w.baudrate().variant(baudrate));
}); });
} }
fn inner(self: Pin<&mut Self>) -> Pin<&mut PeripheralMutex<State<'a, U, T, P1, P2>>> { fn inner(self: Pin<&mut Self>) -> Pin<&mut PeripheralMutex<State<'d, U, T>>> {
unsafe { Pin::new_unchecked(&mut self.get_unchecked_mut().inner) } unsafe { Pin::new_unchecked(&mut self.get_unchecked_mut().inner) }
} }
} }
impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> AsyncBufRead impl<'d, U: UarteInstance, T: TimerInstance> AsyncBufRead for BufferedUarte<'d, U, T> {
for BufferedUarte<'a, U, T, P1, P2>
{
fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> { fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<&[u8]>> {
let mut inner = self.inner(); let mut inner = self.inner();
inner.as_mut().register_interrupt(); inner.as_mut().register_interrupt();
@@ -242,9 +231,7 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
} }
} }
impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> AsyncWrite impl<'d, U: UarteInstance, T: TimerInstance> AsyncWrite for BufferedUarte<'d, U, T> {
for BufferedUarte<'a, U, T, P1, P2>
{
fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<Result<usize>> { fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<Result<usize>> {
let mut inner = self.inner(); let mut inner = self.inner();
inner.as_mut().register_interrupt(); inner.as_mut().register_interrupt();
@@ -276,32 +263,36 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
} }
} }
impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> Drop impl<'a, U: UarteInstance, T: TimerInstance> Drop for State<'a, U, T> {
for State<'a, U, T, P1, P2>
{
fn drop(&mut self) { fn drop(&mut self) {
self.timer.tasks_stop.write(|w| unsafe { w.bits(1) }); let r = self.uarte.regs();
let rt = self.timer.regs();
// TODO this probably deadlocks. do like Uarte instead.
rt.tasks_stop.write(|w| unsafe { w.bits(1) });
if let RxState::Receiving = self.rx_state { if let RxState::Receiving = self.rx_state {
self.uarte.tasks_stoprx.write(|w| unsafe { w.bits(1) }); r.tasks_stoprx.write(|w| unsafe { w.bits(1) });
} }
if let TxState::Transmitting(_) = self.tx_state { if let TxState::Transmitting(_) = self.tx_state {
self.uarte.tasks_stoptx.write(|w| unsafe { w.bits(1) }); r.tasks_stoptx.write(|w| unsafe { w.bits(1) });
} }
if let RxState::Receiving = self.rx_state { if let RxState::Receiving = self.rx_state {
low_power_wait_until(|| self.uarte.events_endrx.read().bits() == 1); low_power_wait_until(|| r.events_endrx.read().bits() == 1);
} }
if let TxState::Transmitting(_) = self.tx_state { if let TxState::Transmitting(_) = self.tx_state {
low_power_wait_until(|| self.uarte.events_endtx.read().bits() == 1); low_power_wait_until(|| r.events_endtx.read().bits() == 1);
} }
} }
} }
impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi> PeripheralState impl<'a, U: UarteInstance, T: TimerInstance> PeripheralState for State<'a, U, T> {
for State<'a, U, T, P1, P2>
{
type Interrupt = U::Interrupt; type Interrupt = U::Interrupt;
fn on_interrupt(&mut self) { fn on_interrupt(&mut self) {
trace!("irq: start"); trace!("irq: start");
let r = self.uarte.regs();
let rt = self.timer.regs();
loop { loop {
match self.rx_state { match self.rx_state {
RxState::Idle => { RxState::Idle => {
@@ -313,11 +304,11 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
self.rx_state = RxState::Receiving; self.rx_state = RxState::Receiving;
// Set up the DMA read // Set up the DMA read
self.uarte.rxd.ptr.write(|w| r.rxd.ptr.write(|w|
// The PTR field is a full 32 bits wide and accepts the full range // The PTR field is a full 32 bits wide and accepts the full range
// of values. // of values.
unsafe { w.ptr().bits(buf.as_ptr() as u32) }); unsafe { w.ptr().bits(buf.as_ptr() as u32) });
self.uarte.rxd.maxcnt.write(|w| r.rxd.maxcnt.write(|w|
// We're giving it the length of the buffer, so no danger of // We're giving it the length of the buffer, so no danger of
// accessing invalid memory. We have verified that the length of the // accessing invalid memory. We have verified that the length of the
// buffer fits in an `u8`, so the cast to `u8` is also fine. // buffer fits in an `u8`, so the cast to `u8` is also fine.
@@ -328,7 +319,7 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
trace!(" irq_rx: buf {:?} {:?}", buf.as_ptr() as u32, buf.len()); trace!(" irq_rx: buf {:?} {:?}", buf.as_ptr() as u32, buf.len());
// Start UARTE Receive transaction // Start UARTE Receive transaction
self.uarte.tasks_startrx.write(|w| r.tasks_startrx.write(|w|
// `1` is a valid value to write to task registers. // `1` is a valid value to write to task registers.
unsafe { w.bits(1) }); unsafe { w.bits(1) });
} }
@@ -336,14 +327,14 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
} }
RxState::Receiving => { RxState::Receiving => {
trace!(" irq_rx: in state receiving"); trace!(" irq_rx: in state receiving");
if self.uarte.events_endrx.read().bits() != 0 { if r.events_endrx.read().bits() != 0 {
self.timer.tasks_stop.write(|w| unsafe { w.bits(1) }); rt.tasks_stop.write(|w| unsafe { w.bits(1) });
let n: usize = self.uarte.rxd.amount.read().amount().bits() as usize; let n: usize = r.rxd.amount.read().amount().bits() as usize;
trace!(" irq_rx: endrx {:?}", n); trace!(" irq_rx: endrx {:?}", n);
self.rx.push(n); self.rx.push(n);
self.uarte.events_endrx.reset(); r.events_endrx.reset();
self.rx_waker.wake(); self.rx_waker.wake();
self.rx_state = RxState::Idle; self.rx_state = RxState::Idle;
@@ -364,11 +355,11 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
self.tx_state = TxState::Transmitting(buf.len()); self.tx_state = TxState::Transmitting(buf.len());
// Set up the DMA write // Set up the DMA write
self.uarte.txd.ptr.write(|w| r.txd.ptr.write(|w|
// The PTR field is a full 32 bits wide and accepts the full range // The PTR field is a full 32 bits wide and accepts the full range
// of values. // of values.
unsafe { w.ptr().bits(buf.as_ptr() as u32) }); unsafe { w.ptr().bits(buf.as_ptr() as u32) });
self.uarte.txd.maxcnt.write(|w| r.txd.maxcnt.write(|w|
// We're giving it the length of the buffer, so no danger of // We're giving it the length of the buffer, so no danger of
// accessing invalid memory. We have verified that the length of the // accessing invalid memory. We have verified that the length of the
// buffer fits in an `u8`, so the cast to `u8` is also fine. // buffer fits in an `u8`, so the cast to `u8` is also fine.
@@ -378,7 +369,7 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
unsafe { w.maxcnt().bits(buf.len() as _) }); unsafe { w.maxcnt().bits(buf.len() as _) });
// Start UARTE Transmit transaction // Start UARTE Transmit transaction
self.uarte.tasks_starttx.write(|w| r.tasks_starttx.write(|w|
// `1` is a valid value to write to task registers. // `1` is a valid value to write to task registers.
unsafe { w.bits(1) }); unsafe { w.bits(1) });
} }
@@ -386,8 +377,8 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
} }
TxState::Transmitting(n) => { TxState::Transmitting(n) => {
trace!(" irq_tx: in state Transmitting"); trace!(" irq_tx: in state Transmitting");
if self.uarte.events_endtx.read().bits() != 0 { if r.events_endtx.read().bits() != 0 {
self.uarte.events_endtx.reset(); r.events_endtx.reset();
trace!(" irq_tx: endtx {:?}", n); trace!(" irq_tx: endtx {:?}", n);
self.tx.pop(n); self.tx.pop(n);
@@ -402,37 +393,3 @@ impl<'a, U: Instance, T: TimerInstance, P1: ConfigurablePpi, P2: ConfigurablePpi
trace!("irq: end"); trace!("irq: end");
} }
} }
mod sealed {
pub trait Instance {}
impl Instance for crate::pac::UARTE0 {}
#[cfg(any(feature = "52833", feature = "52840", feature = "9160"))]
impl Instance for crate::pac::UARTE1 {}
pub trait TimerInstance {}
impl TimerInstance for crate::pac::TIMER0 {}
impl TimerInstance for crate::pac::TIMER1 {}
impl TimerInstance for crate::pac::TIMER2 {}
}
pub trait Instance: Deref<Target = pac::uarte0::RegisterBlock> + sealed::Instance {
type Interrupt: Interrupt;
}
impl Instance for pac::UARTE0 {
type Interrupt = interrupt::UARTE0_UART0;
}
#[cfg(any(feature = "52833", feature = "52840", feature = "9160"))]
impl Instance for pac::UARTE1 {
type Interrupt = interrupt::UARTE1;
}
pub trait TimerInstance:
Deref<Target = pac::timer0::RegisterBlock> + sealed::TimerInstance
{
}
impl TimerInstance for crate::pac::TIMER0 {}
impl TimerInstance for crate::pac::TIMER1 {}
impl TimerInstance for crate::pac::TIMER2 {}

11
embassy-nrf/src/lib.rs
View File

@@ -40,17 +40,6 @@ pub use nrf52833_pac as pac;
#[cfg(feature = "52840")] #[cfg(feature = "52840")]
pub use nrf52840_pac as pac; pub use nrf52840_pac as pac;
#[cfg(feature = "52810")]
pub use nrf52810_hal as hal;
#[cfg(feature = "52811")]
pub use nrf52811_hal as hal;
#[cfg(feature = "52832")]
pub use nrf52832_hal as hal;
#[cfg(feature = "52833")]
pub use nrf52833_hal as hal;
#[cfg(feature = "52840")]
pub use nrf52840_hal as hal;
/// Length of Nordic EasyDMA differs for MCUs /// Length of Nordic EasyDMA differs for MCUs
#[cfg(any( #[cfg(any(
feature = "52810", feature = "52810",