diff options
| author | Priit Laes <[email protected]> | 2024-02-17 13:02:56 +0200 |
|---|---|---|
| committer | Priit Laes <[email protected]> | 2024-02-17 13:30:19 +0200 |
| commit | bb2fb59a87d3aa1322cb13280287851d3ec39f59 (patch) | |
| tree | bcb2f83c9aa73d13a772cc92b2eb6e2949986e5b /embassy-nrf | |
| parent | 1aa999c2a825bdaf6fa4c980f47428d9b1d9263f (diff) | |
nrf: Remove useless borrows
Diffstat (limited to 'embassy-nrf')
| -rw-r--r-- | embassy-nrf/src/buffered_uarte.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/pwm.rs | 4 | ||||
| -rw-r--r-- | embassy-nrf/src/twim.rs | 4 | ||||
| -rw-r--r-- | embassy-nrf/src/twis.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/uarte.rs | 10 |
5 files changed, 11 insertions, 11 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs index 2c620798d..fb72422bd 100644 --- a/embassy-nrf/src/buffered_uarte.rs +++ b/embassy-nrf/src/buffered_uarte.rs | |||
| @@ -377,7 +377,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> { | |||
| 377 | }); | 377 | }); |
| 378 | 378 | ||
| 379 | // Enable UARTE instance | 379 | // Enable UARTE instance |
| 380 | apply_workaround_for_enable_anomaly(&r); | 380 | apply_workaround_for_enable_anomaly(r); |
| 381 | r.enable.write(|w| w.enable().enabled()); | 381 | r.enable.write(|w| w.enable().enabled()); |
| 382 | 382 | ||
| 383 | // Configure byte counter. | 383 | // Configure byte counter. |
diff --git a/embassy-nrf/src/pwm.rs b/embassy-nrf/src/pwm.rs index e0583b770..bfcff60a1 100644 --- a/embassy-nrf/src/pwm.rs +++ b/embassy-nrf/src/pwm.rs | |||
| @@ -697,7 +697,7 @@ impl<'d, T: Instance> SimplePwm<'d, T> { | |||
| 697 | // Enable | 697 | // Enable |
| 698 | r.enable.write(|w| w.enable().enabled()); | 698 | r.enable.write(|w| w.enable().enabled()); |
| 699 | 699 | ||
| 700 | r.seq0.ptr.write(|w| unsafe { w.bits((&pwm.duty).as_ptr() as u32) }); | 700 | r.seq0.ptr.write(|w| unsafe { w.bits((pwm.duty).as_ptr() as u32) }); |
| 701 | 701 | ||
| 702 | r.seq0.cnt.write(|w| unsafe { w.bits(4) }); | 702 | r.seq0.cnt.write(|w| unsafe { w.bits(4) }); |
| 703 | r.seq0.refresh.write(|w| unsafe { w.bits(0) }); | 703 | r.seq0.refresh.write(|w| unsafe { w.bits(0) }); |
| @@ -748,7 +748,7 @@ impl<'d, T: Instance> SimplePwm<'d, T> { | |||
| 748 | self.duty[channel] = duty & 0x7FFF; | 748 | self.duty[channel] = duty & 0x7FFF; |
| 749 | 749 | ||
| 750 | // reload ptr in case self was moved | 750 | // reload ptr in case self was moved |
| 751 | r.seq0.ptr.write(|w| unsafe { w.bits((&self.duty).as_ptr() as u32) }); | 751 | r.seq0.ptr.write(|w| unsafe { w.bits((self.duty).as_ptr() as u32) }); |
| 752 | 752 | ||
| 753 | // defensive before seqstart | 753 | // defensive before seqstart |
| 754 | compiler_fence(Ordering::SeqCst); | 754 | compiler_fence(Ordering::SeqCst); |
diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs index 83971463f..30699283f 100644 --- a/embassy-nrf/src/twim.rs +++ b/embassy-nrf/src/twim.rs | |||
| @@ -469,7 +469,7 @@ impl<'d, T: Instance> Twim<'d, T> { | |||
| 469 | trace!("Copying TWIM tx buffer into RAM for DMA"); | 469 | trace!("Copying TWIM tx buffer into RAM for DMA"); |
| 470 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; | 470 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; |
| 471 | tx_ram_buf.copy_from_slice(wr_buffer); | 471 | tx_ram_buf.copy_from_slice(wr_buffer); |
| 472 | self.setup_write_read_from_ram(address, &tx_ram_buf, rd_buffer, inten) | 472 | self.setup_write_read_from_ram(address, tx_ram_buf, rd_buffer, inten) |
| 473 | } | 473 | } |
| 474 | Err(error) => Err(error), | 474 | Err(error) => Err(error), |
| 475 | } | 475 | } |
| @@ -482,7 +482,7 @@ impl<'d, T: Instance> Twim<'d, T> { | |||
| 482 | trace!("Copying TWIM tx buffer into RAM for DMA"); | 482 | trace!("Copying TWIM tx buffer into RAM for DMA"); |
| 483 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; | 483 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; |
| 484 | tx_ram_buf.copy_from_slice(wr_buffer); | 484 | tx_ram_buf.copy_from_slice(wr_buffer); |
| 485 | self.setup_write_from_ram(address, &tx_ram_buf, inten) | 485 | self.setup_write_from_ram(address, tx_ram_buf, inten) |
| 486 | } | 486 | } |
| 487 | Err(error) => Err(error), | 487 | Err(error) => Err(error), |
| 488 | } | 488 | } |
diff --git a/embassy-nrf/src/twis.rs b/embassy-nrf/src/twis.rs index c6c020557..415150447 100644 --- a/embassy-nrf/src/twis.rs +++ b/embassy-nrf/src/twis.rs | |||
| @@ -577,7 +577,7 @@ impl<'d, T: Instance> Twis<'d, T> { | |||
| 577 | trace!("Copying TWIS tx buffer into RAM for DMA"); | 577 | trace!("Copying TWIS tx buffer into RAM for DMA"); |
| 578 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; | 578 | let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()]; |
| 579 | tx_ram_buf.copy_from_slice(wr_buffer); | 579 | tx_ram_buf.copy_from_slice(wr_buffer); |
| 580 | self.setup_respond_from_ram(&tx_ram_buf, inten) | 580 | self.setup_respond_from_ram(tx_ram_buf, inten) |
| 581 | } | 581 | } |
| 582 | Err(error) => Err(error), | 582 | Err(error) => Err(error), |
| 583 | } | 583 | } |
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 3d486452f..67b3feae7 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs | |||
| @@ -308,7 +308,7 @@ fn configure(r: &RegisterBlock, config: Config, hardware_flow_control: bool) { | |||
| 308 | r.events_txstarted.reset(); | 308 | r.events_txstarted.reset(); |
| 309 | 309 | ||
| 310 | // Enable | 310 | // Enable |
| 311 | apply_workaround_for_enable_anomaly(&r); | 311 | apply_workaround_for_enable_anomaly(r); |
| 312 | r.enable.write(|w| w.enable().enabled()); | 312 | r.enable.write(|w| w.enable().enabled()); |
| 313 | } | 313 | } |
| 314 | 314 | ||
| @@ -378,7 +378,7 @@ impl<'d, T: Instance> UarteTx<'d, T> { | |||
| 378 | trace!("Copying UARTE tx buffer into RAM for DMA"); | 378 | trace!("Copying UARTE tx buffer into RAM for DMA"); |
| 379 | let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()]; | 379 | let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()]; |
| 380 | ram_buf.copy_from_slice(buffer); | 380 | ram_buf.copy_from_slice(buffer); |
| 381 | self.write_from_ram(&ram_buf).await | 381 | self.write_from_ram(ram_buf).await |
| 382 | } | 382 | } |
| 383 | Err(error) => Err(error), | 383 | Err(error) => Err(error), |
| 384 | } | 384 | } |
| @@ -448,7 +448,7 @@ impl<'d, T: Instance> UarteTx<'d, T> { | |||
| 448 | trace!("Copying UARTE tx buffer into RAM for DMA"); | 448 | trace!("Copying UARTE tx buffer into RAM for DMA"); |
| 449 | let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()]; | 449 | let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()]; |
| 450 | ram_buf.copy_from_slice(buffer); | 450 | ram_buf.copy_from_slice(buffer); |
| 451 | self.blocking_write_from_ram(&ram_buf) | 451 | self.blocking_write_from_ram(ram_buf) |
| 452 | } | 452 | } |
| 453 | Err(error) => Err(error), | 453 | Err(error) => Err(error), |
| 454 | } | 454 | } |
| @@ -504,7 +504,7 @@ impl<'a, T: Instance> Drop for UarteTx<'a, T> { | |||
| 504 | 504 | ||
| 505 | let s = T::state(); | 505 | let s = T::state(); |
| 506 | 506 | ||
| 507 | drop_tx_rx(&r, &s); | 507 | drop_tx_rx(r, s); |
| 508 | } | 508 | } |
| 509 | } | 509 | } |
| 510 | 510 | ||
| @@ -744,7 +744,7 @@ impl<'a, T: Instance> Drop for UarteRx<'a, T> { | |||
| 744 | 744 | ||
| 745 | let s = T::state(); | 745 | let s = T::state(); |
| 746 | 746 | ||
| 747 | drop_tx_rx(&r, &s); | 747 | drop_tx_rx(r, s); |
| 748 | } | 748 | } |
| 749 | } | 749 | } |
| 750 | 750 | ||
