diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-07-23 14:27:45 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-07-23 14:27:45 +0200 |
| commit | f02ba35482790a54067978cde923867de3dc52a2 (patch) | |
| tree | 3260a5ffd1e65e21f019b8ee367fe290b2aeee7d /embassy-nrf/src/buffered_uarte.rs | |
| parent | a158295782b75bce5f83f5d1c2c476b841493979 (diff) | |
Remove PeripheralRef::into_inner()
Diffstat (limited to 'embassy-nrf/src/buffered_uarte.rs')
| -rw-r--r-- | embassy-nrf/src/buffered_uarte.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs index 48ffe5c29..036af3804 100644 --- a/embassy-nrf/src/buffered_uarte.rs +++ b/embassy-nrf/src/buffered_uarte.rs | |||
| @@ -147,8 +147,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> { | |||
| 147 | timer.cc(0).short_compare_stop(); | 147 | timer.cc(0).short_compare_stop(); |
| 148 | 148 | ||
| 149 | let mut ppi_ch1 = Ppi::new_one_to_two( | 149 | let mut ppi_ch1 = Ppi::new_one_to_two( |
| 150 | //TODO: Avoid into_inner? | 150 | ppi_ch1.map_into(), |
| 151 | unsafe { ppi_ch1.into_inner() }.degrade(), | ||
| 152 | Event::from_reg(&r.events_rxdrdy), | 151 | Event::from_reg(&r.events_rxdrdy), |
| 153 | timer.task_clear(), | 152 | timer.task_clear(), |
| 154 | timer.task_start(), | 153 | timer.task_start(), |
| @@ -156,16 +155,14 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> { | |||
| 156 | ppi_ch1.enable(); | 155 | ppi_ch1.enable(); |
| 157 | 156 | ||
| 158 | let mut ppi_ch2 = Ppi::new_one_to_one( | 157 | let mut ppi_ch2 = Ppi::new_one_to_one( |
| 159 | //TODO: Avoid into_inner? | 158 | ppi_ch2.map_into(), |
| 160 | unsafe { ppi_ch2.into_inner() }.degrade(), | ||
| 161 | timer.cc(0).event_compare(), | 159 | timer.cc(0).event_compare(), |
| 162 | Task::from_reg(&r.tasks_stoprx), | 160 | Task::from_reg(&r.tasks_stoprx), |
| 163 | ); | 161 | ); |
| 164 | ppi_ch2.enable(); | 162 | ppi_ch2.enable(); |
| 165 | 163 | ||
| 166 | Self { | 164 | Self { |
| 167 | //TODO: Avoid into_inner? | 165 | inner: PeripheralMutex::new(irq, &mut state.0, move || StateInner { |
| 168 | inner: PeripheralMutex::new(unsafe { irq.into_inner() }, &mut state.0, move || StateInner { | ||
| 169 | phantom: PhantomData, | 166 | phantom: PhantomData, |
| 170 | timer, | 167 | timer, |
| 171 | _ppi_ch1: ppi_ch1, | 168 | _ppi_ch1: ppi_ch1, |
