diff --git a/src/libboard_artiq/src/drtioaux.rs b/src/libboard_artiq/src/drtioaux.rs index ca94618..5612271 100644 --- a/src/libboard_artiq/src/drtioaux.rs +++ b/src/libboard_artiq/src/drtioaux.rs @@ -1,5 +1,4 @@ -use core::slice; -use core::arch::asm; +use core::{arch::asm, slice}; use core_io::{Error as IoError, ErrorKind as IoErrorKind}; use crc; diff --git a/src/libboard_artiq/src/fiq.rs b/src/libboard_artiq/src/fiq.rs index 6da0bb2..f6d8fa4 100644 --- a/src/libboard_artiq/src/fiq.rs +++ b/src/libboard_artiq/src/fiq.rs @@ -1,7 +1,8 @@ +use core::arch::asm; + use libboard_zynq::{println, stdio}; use libcortex_a9::{interrupt_handler, regs::MPIDR}; use libregister::RegisterR; -use core::arch::asm; #[cfg(has_si549)] use crate::si549; diff --git a/src/libksupport/src/irq.rs b/src/libksupport/src/irq.rs index 51b6c25..12f680e 100644 --- a/src/libksupport/src/irq.rs +++ b/src/libksupport/src/irq.rs @@ -1,9 +1,9 @@ -use core::sync::atomic::{AtomicBool, Ordering}; +use core::{arch::asm, + sync::atomic::{AtomicBool, Ordering}}; use libboard_zynq::{gic, mpcore, println, stdio}; use libcortex_a9::{asm, interrupt_handler, notify_spin_lock, regs::MPIDR, spin_lock_yield}; use libregister::RegisterR; -use core::arch::asm; extern "C" { static mut __stack1_start: u32;