nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
kalkyl 2023-04-27 17:09:16 +02:00
parent 278818395e
commit 31b54e0fbd
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-rp/src/flash.rs
View File

@ -162,8 +162,6 @@ impl<'d, T: Instance, const FLASH_SIZE: usize> Flash<'d, T, FLASH_SIZE> {
/// - interrupts must be disabled /// - interrupts must be disabled
/// - DMA must not access flash memory /// - DMA must not access flash memory
unsafe fn in_ram(&mut self, operation: impl FnOnce()) -> Result<(), Error> { unsafe fn in_ram(&mut self, operation: impl FnOnce()) -> Result<(), Error> {
let dma_status = &mut [false; crate::dma::CHANNEL_COUNT];
// Make sure we're running on CORE0 // Make sure we're running on CORE0
let core_id: u32 = unsafe { pac::SIO.cpuid().read() }; let core_id: u32 = unsafe { pac::SIO.cpuid().read() };
if core_id != 0 { if core_id != 0 {
@ -178,9 +176,7 @@ impl<'d, T: Instance, const FLASH_SIZE: usize> Flash<'d, T, FLASH_SIZE> {
const SRAM_LOWER: u32 = 0x2000_0000; const SRAM_LOWER: u32 = 0x2000_0000;
for n in 0..crate::dma::CHANNEL_COUNT { for n in 0..crate::dma::CHANNEL_COUNT {
let ch = crate::pac::DMA.ch(n); let ch = crate::pac::DMA.ch(n);
if ch.read_addr().read() < SRAM_LOWER { while ch.read_addr().read() < SRAM_LOWER && ch.ctrl_trig().read().busy() {}
while ch.ctrl_trig().read().busy() {}
}
} }
// Run our flash operation in RAM // Run our flash operation in RAM