diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-10-06 22:56:31 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2025-10-06 23:19:53 +0200 |
| commit | 8730a013c395cf0bf4c2fa8eeb7f138288103039 (patch) | |
| tree | 39eca5fbc4570bd0129c9a291f134de5dab98820 /embassy-imxrt | |
| parent | abc8e450f936567ad42cb34b5d2a7941b206aa5d (diff) | |
Rustfmt for edition 2024.
Diffstat (limited to 'embassy-imxrt')
| -rw-r--r-- | embassy-imxrt/src/clocks.rs | 2 | ||||
| -rw-r--r-- | embassy-imxrt/src/crc.rs | 4 | ||||
| -rw-r--r-- | embassy-imxrt/src/dma.rs | 6 | ||||
| -rw-r--r-- | embassy-imxrt/src/flexcomm/mod.rs | 18 | ||||
| -rw-r--r-- | embassy-imxrt/src/flexcomm/uart.rs | 4 | ||||
| -rw-r--r-- | embassy-imxrt/src/gpio.rs | 2 | ||||
| -rw-r--r-- | embassy-imxrt/src/iopctl.rs | 2 | ||||
| -rw-r--r-- | embassy-imxrt/src/lib.rs | 2 | ||||
| -rw-r--r-- | embassy-imxrt/src/rng.rs | 4 | ||||
| -rw-r--r-- | embassy-imxrt/src/time_driver.rs | 4 |
10 files changed, 27 insertions, 21 deletions
diff --git a/embassy-imxrt/src/clocks.rs b/embassy-imxrt/src/clocks.rs index 39c3e6238..22df2686f 100644 --- a/embassy-imxrt/src/clocks.rs +++ b/embassy-imxrt/src/clocks.rs | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | //! Clock configuration for the `RT6xx` | 1 | //! Clock configuration for the `RT6xx` |
| 2 | use core::sync::atomic::{AtomicU32, AtomicU8, Ordering}; | 2 | use core::sync::atomic::{AtomicU8, AtomicU32, Ordering}; |
| 3 | 3 | ||
| 4 | use paste::paste; | 4 | use paste::paste; |
| 5 | 5 | ||
diff --git a/embassy-imxrt/src/crc.rs b/embassy-imxrt/src/crc.rs index 24d6ba5bd..d6f0419d0 100644 --- a/embassy-imxrt/src/crc.rs +++ b/embassy-imxrt/src/crc.rs | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | use core::marker::PhantomData; | 3 | use core::marker::PhantomData; |
| 4 | 4 | ||
| 5 | use crate::clocks::{enable_and_reset, SysconPeripheral}; | 5 | use crate::clocks::{SysconPeripheral, enable_and_reset}; |
| 6 | pub use crate::pac::crc_engine::mode::CrcPolynomial as Polynomial; | 6 | pub use crate::pac::crc_engine::mode::CrcPolynomial as Polynomial; |
| 7 | use crate::{peripherals, Peri, PeripheralType}; | 7 | use crate::{Peri, PeripheralType, peripherals}; |
| 8 | 8 | ||
| 9 | /// CRC driver. | 9 | /// CRC driver. |
| 10 | pub struct Crc<'d> { | 10 | pub struct Crc<'d> { |
diff --git a/embassy-imxrt/src/dma.rs b/embassy-imxrt/src/dma.rs index e141447f3..e71a27e0e 100644 --- a/embassy-imxrt/src/dma.rs +++ b/embassy-imxrt/src/dma.rs | |||
| @@ -2,10 +2,10 @@ | |||
| 2 | 2 | ||
| 3 | use core::future::Future; | 3 | use core::future::Future; |
| 4 | use core::pin::Pin; | 4 | use core::pin::Pin; |
| 5 | use core::sync::atomic::{compiler_fence, Ordering}; | 5 | use core::sync::atomic::{Ordering, compiler_fence}; |
| 6 | use core::task::{Context, Poll}; | 6 | use core::task::{Context, Poll}; |
| 7 | 7 | ||
| 8 | use embassy_hal_internal::{impl_peripheral, Peri, PeripheralType}; | 8 | use embassy_hal_internal::{Peri, PeripheralType, impl_peripheral}; |
| 9 | use embassy_sync::waitqueue::AtomicWaker; | 9 | use embassy_sync::waitqueue::AtomicWaker; |
| 10 | use pac::dma0::channel::cfg::Periphreqen; | 10 | use pac::dma0::channel::cfg::Periphreqen; |
| 11 | use pac::dma0::channel::xfercfg::{Dstinc, Srcinc, Width}; | 11 | use pac::dma0::channel::xfercfg::{Dstinc, Srcinc, Width}; |
| @@ -14,7 +14,7 @@ use crate::clocks::enable_and_reset; | |||
| 14 | use crate::interrupt::InterruptExt; | 14 | use crate::interrupt::InterruptExt; |
| 15 | use crate::peripherals::DMA0; | 15 | use crate::peripherals::DMA0; |
| 16 | use crate::sealed::Sealed; | 16 | use crate::sealed::Sealed; |
| 17 | use crate::{interrupt, pac, peripherals, BitIter}; | 17 | use crate::{BitIter, interrupt, pac, peripherals}; |
| 18 | 18 | ||
| 19 | #[cfg(feature = "rt")] | 19 | #[cfg(feature = "rt")] |
| 20 | #[interrupt] | 20 | #[interrupt] |
diff --git a/embassy-imxrt/src/flexcomm/mod.rs b/embassy-imxrt/src/flexcomm/mod.rs index 4473c9a77..27794042b 100644 --- a/embassy-imxrt/src/flexcomm/mod.rs +++ b/embassy-imxrt/src/flexcomm/mod.rs | |||
| @@ -4,11 +4,11 @@ pub mod uart; | |||
| 4 | 4 | ||
| 5 | use paste::paste; | 5 | use paste::paste; |
| 6 | 6 | ||
| 7 | use crate::clocks::{enable_and_reset, SysconPeripheral}; | 7 | use crate::clocks::{SysconPeripheral, enable_and_reset}; |
| 8 | use crate::peripherals::{ | 8 | use crate::peripherals::{ |
| 9 | FLEXCOMM0, FLEXCOMM1, FLEXCOMM14, FLEXCOMM15, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, | 9 | FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, FLEXCOMM14, FLEXCOMM15, |
| 10 | }; | 10 | }; |
| 11 | use crate::{pac, PeripheralType}; | 11 | use crate::{PeripheralType, pac}; |
| 12 | 12 | ||
| 13 | /// clock selection option | 13 | /// clock selection option |
| 14 | #[derive(Copy, Clone, Debug)] | 14 | #[derive(Copy, Clone, Debug)] |
| @@ -223,9 +223,15 @@ macro_rules! into_mode { | |||
| 223 | } | 223 | } |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | into_mode!(usart, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7); | 226 | into_mode!( |
| 227 | into_mode!(spi, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, FLEXCOMM14); | 227 | usart, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7 |
| 228 | into_mode!(i2c, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, FLEXCOMM15); | 228 | ); |
| 229 | into_mode!( | ||
| 230 | spi, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, FLEXCOMM14 | ||
| 231 | ); | ||
| 232 | into_mode!( | ||
| 233 | i2c, FLEXCOMM0, FLEXCOMM1, FLEXCOMM2, FLEXCOMM3, FLEXCOMM4, FLEXCOMM5, FLEXCOMM6, FLEXCOMM7, FLEXCOMM15 | ||
| 234 | ); | ||
| 229 | 235 | ||
| 230 | into_mode!( | 236 | into_mode!( |
| 231 | i2s_transmit, | 237 | i2s_transmit, |
diff --git a/embassy-imxrt/src/flexcomm/uart.rs b/embassy-imxrt/src/flexcomm/uart.rs index 230b30d43..2b759ba84 100644 --- a/embassy-imxrt/src/flexcomm/uart.rs +++ b/embassy-imxrt/src/flexcomm/uart.rs | |||
| @@ -2,10 +2,10 @@ | |||
| 2 | 2 | ||
| 3 | use core::future::poll_fn; | 3 | use core::future::poll_fn; |
| 4 | use core::marker::PhantomData; | 4 | use core::marker::PhantomData; |
| 5 | use core::sync::atomic::{compiler_fence, AtomicU8, Ordering}; | 5 | use core::sync::atomic::{AtomicU8, Ordering, compiler_fence}; |
| 6 | use core::task::Poll; | 6 | use core::task::Poll; |
| 7 | 7 | ||
| 8 | use embassy_futures::select::{select, Either}; | 8 | use embassy_futures::select::{Either, select}; |
| 9 | use embassy_hal_internal::drop::OnDrop; | 9 | use embassy_hal_internal::drop::OnDrop; |
| 10 | use embassy_hal_internal::{Peri, PeripheralType}; | 10 | use embassy_hal_internal::{Peri, PeripheralType}; |
| 11 | use embassy_sync::waitqueue::AtomicWaker; | 11 | use embassy_sync::waitqueue::AtomicWaker; |
diff --git a/embassy-imxrt/src/gpio.rs b/embassy-imxrt/src/gpio.rs index e62fde8b1..4a0608e76 100644 --- a/embassy-imxrt/src/gpio.rs +++ b/embassy-imxrt/src/gpio.rs | |||
| @@ -13,7 +13,7 @@ use crate::clocks::enable_and_reset; | |||
| 13 | use crate::iopctl::IopctlPin; | 13 | use crate::iopctl::IopctlPin; |
| 14 | pub use crate::iopctl::{AnyPin, DriveMode, DriveStrength, Function, Inverter, Pull, SlewRate}; | 14 | pub use crate::iopctl::{AnyPin, DriveMode, DriveStrength, Function, Inverter, Pull, SlewRate}; |
| 15 | use crate::sealed::Sealed; | 15 | use crate::sealed::Sealed; |
| 16 | use crate::{interrupt, peripherals, BitIter, Peri, PeripheralType}; | 16 | use crate::{BitIter, Peri, PeripheralType, interrupt, peripherals}; |
| 17 | 17 | ||
| 18 | // This should be unique per IMXRT package | 18 | // This should be unique per IMXRT package |
| 19 | const PORT_COUNT: usize = 8; | 19 | const PORT_COUNT: usize = 8; |
diff --git a/embassy-imxrt/src/iopctl.rs b/embassy-imxrt/src/iopctl.rs index a3b8b14d6..805bf2f1b 100644 --- a/embassy-imxrt/src/iopctl.rs +++ b/embassy-imxrt/src/iopctl.rs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | //! | 2 | //! |
| 3 | //! Also known as IO Pin Configuration (IOCON) | 3 | //! Also known as IO Pin Configuration (IOCON) |
| 4 | 4 | ||
| 5 | use crate::pac::{iopctl, Iopctl}; | 5 | use crate::pac::{Iopctl, iopctl}; |
| 6 | 6 | ||
| 7 | // A generic pin of any type. | 7 | // A generic pin of any type. |
| 8 | // | 8 | // |
diff --git a/embassy-imxrt/src/lib.rs b/embassy-imxrt/src/lib.rs index 00ac9af29..643dd0c8a 100644 --- a/embassy-imxrt/src/lib.rs +++ b/embassy-imxrt/src/lib.rs | |||
| @@ -40,7 +40,7 @@ pub use chip::interrupts::*; | |||
| 40 | pub use chip::pac; | 40 | pub use chip::pac; |
| 41 | #[cfg(not(feature = "unstable-pac"))] | 41 | #[cfg(not(feature = "unstable-pac"))] |
| 42 | pub(crate) use chip::pac; | 42 | pub(crate) use chip::pac; |
| 43 | pub use chip::{peripherals, Peripherals}; | 43 | pub use chip::{Peripherals, peripherals}; |
| 44 | pub use embassy_hal_internal::{Peri, PeripheralType}; | 44 | pub use embassy_hal_internal::{Peri, PeripheralType}; |
| 45 | 45 | ||
| 46 | #[cfg(feature = "rt")] | 46 | #[cfg(feature = "rt")] |
diff --git a/embassy-imxrt/src/rng.rs b/embassy-imxrt/src/rng.rs index 75f243df9..094418e41 100644 --- a/embassy-imxrt/src/rng.rs +++ b/embassy-imxrt/src/rng.rs | |||
| @@ -7,9 +7,9 @@ use core::task::Poll; | |||
| 7 | use embassy_futures::block_on; | 7 | use embassy_futures::block_on; |
| 8 | use embassy_sync::waitqueue::AtomicWaker; | 8 | use embassy_sync::waitqueue::AtomicWaker; |
| 9 | 9 | ||
| 10 | use crate::clocks::{enable_and_reset, SysconPeripheral}; | 10 | use crate::clocks::{SysconPeripheral, enable_and_reset}; |
| 11 | use crate::interrupt::typelevel::Interrupt; | 11 | use crate::interrupt::typelevel::Interrupt; |
| 12 | use crate::{interrupt, peripherals, Peri, PeripheralType}; | 12 | use crate::{Peri, PeripheralType, interrupt, peripherals}; |
| 13 | 13 | ||
| 14 | static RNG_WAKER: AtomicWaker = AtomicWaker::new(); | 14 | static RNG_WAKER: AtomicWaker = AtomicWaker::new(); |
| 15 | 15 | ||
diff --git a/embassy-imxrt/src/time_driver.rs b/embassy-imxrt/src/time_driver.rs index f127609c8..fbd935b70 100644 --- a/embassy-imxrt/src/time_driver.rs +++ b/embassy-imxrt/src/time_driver.rs | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | //! Time Driver. | 1 | //! Time Driver. |
| 2 | use core::cell::{Cell, RefCell}; | 2 | use core::cell::{Cell, RefCell}; |
| 3 | #[cfg(feature = "time-driver-rtc")] | 3 | #[cfg(feature = "time-driver-rtc")] |
| 4 | use core::sync::atomic::{compiler_fence, AtomicU32, Ordering}; | 4 | use core::sync::atomic::{AtomicU32, Ordering, compiler_fence}; |
| 5 | 5 | ||
| 6 | use critical_section::CriticalSection; | 6 | use critical_section::CriticalSection; |
| 7 | use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; | ||
| 8 | use embassy_sync::blocking_mutex::Mutex; | 7 | use embassy_sync::blocking_mutex::Mutex; |
| 8 | use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; | ||
| 9 | use embassy_time_driver::Driver; | 9 | use embassy_time_driver::Driver; |
| 10 | use embassy_time_queue_utils::Queue; | 10 | use embassy_time_queue_utils::Queue; |
| 11 | 11 | ||
