aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf/src/buffered_uarte.rs
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-04-14 16:01:43 +0200
committerDario Nieuwenhuis <[email protected]>2021-04-14 17:04:40 +0200
commit59ccc45f280e05a9d2a0ece2bb1e01debadb2f7e (patch)
tree14e39ffbab69238fb330fb21bd9d5894486d0d0b /embassy-nrf/src/buffered_uarte.rs
parentb34b74de9de38e4bee9a4c8d95246bf9d138f86f (diff)
Remove pin from Uart
Diffstat (limited to 'embassy-nrf/src/buffered_uarte.rs')
-rw-r--r--embassy-nrf/src/buffered_uarte.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index 702ccde0e..9e67aaef6 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -78,7 +78,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
78 ) -> Self { 78 ) -> Self {
79 unborrow!(uarte, timer, ppi_ch1, ppi_ch2, irq, rxd, txd, cts, rts); 79 unborrow!(uarte, timer, ppi_ch1, ppi_ch2, irq, rxd, txd, cts, rts);
80 80
81 let r = uarte.regs(); 81 let r = U::regs();
82 let rt = timer.regs(); 82 let rt = timer.regs();
83 83
84 rxd.conf().write(|w| w.input().connect().drive().h0h1()); 84 rxd.conf().write(|w| w.input().connect().drive().h0h1());
@@ -178,7 +178,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
178 178
179 pub fn set_baudrate(self: Pin<&mut Self>, baudrate: Baudrate) { 179 pub fn set_baudrate(self: Pin<&mut Self>, baudrate: Baudrate) {
180 self.inner().with(|state, _irq| { 180 self.inner().with(|state, _irq| {
181 let r = state.uarte.regs(); 181 let r = U::regs();
182 let rt = state.timer.regs(); 182 let rt = state.timer.regs();
183 183
184 let timeout = 0x8000_0000 / (baudrate as u32 / 40); 184 let timeout = 0x8000_0000 / (baudrate as u32 / 40);
@@ -265,7 +265,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> AsyncWrite for BufferedUarte<'d, U,
265 265
266impl<'a, U: UarteInstance, T: TimerInstance> Drop for State<'a, U, T> { 266impl<'a, U: UarteInstance, T: TimerInstance> Drop for State<'a, U, T> {
267 fn drop(&mut self) { 267 fn drop(&mut self) {
268 let r = self.uarte.regs(); 268 let r = U::regs();
269 let rt = self.timer.regs(); 269 let rt = self.timer.regs();
270 270
271 // TODO this probably deadlocks. do like Uarte instead. 271 // TODO this probably deadlocks. do like Uarte instead.
@@ -290,7 +290,7 @@ impl<'a, U: UarteInstance, T: TimerInstance> PeripheralState for State<'a, U, T>
290 type Interrupt = U::Interrupt; 290 type Interrupt = U::Interrupt;
291 fn on_interrupt(&mut self) { 291 fn on_interrupt(&mut self) {
292 trace!("irq: start"); 292 trace!("irq: start");
293 let r = self.uarte.regs(); 293 let r = U::regs();
294 let rt = self.timer.regs(); 294 let rt = self.timer.regs();
295 295
296 loop { 296 loop {