diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml index 18f65e8..c6577fa 100644 --- a/examples/embassy/Cargo.toml +++ b/examples/embassy/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["no-std", "arm", "cortex-a", "amd", "zynq7000"] categories = ["embedded", "no-std", "hardware-support"] [dependencies] -cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", features = ["critical-section-single-core"] } +cortex-ar = "0.2" zynq7000-rt = { path = "../../zynq7000-rt" } zynq7000 = { path = "../../zynq7000" } zynq7000-hal = { path = "../../zynq7000-hal" } diff --git a/examples/embassy/src/bin/dht22-open-drain-pins.rs b/examples/embassy/src/bin/dht22-open-drain-pins.rs index e81c99c..534d5f6 100644 --- a/examples/embassy/src/bin/dht22-open-drain-pins.rs +++ b/examples/embassy/src/bin/dht22-open-drain-pins.rs @@ -10,13 +10,13 @@ use embedded_hal::{delay::DelayNs, digital::StatefulOutputPin}; use embedded_io::Write; use log::{error, info, warn}; use zynq7000_hal::{ + BootMode, clocks::Clocks, gic::{GicConfigurator, GicInterruptHelper, Interrupt}, - gpio::{mio, Flex, Output, PinState}, + gpio::{Flex, Output, PinState, mio}, gtc::Gtc, time::Hertz, uart::{ClkConfigRaw, Uart, UartConfig}, - BootMode, }; use zynq7000::PsPeripherals; @@ -148,7 +148,7 @@ async fn main(_spawner: Spawner) -> ! { info!("Humidity: {} %", reading.relative_humidity); } Err(err) => { - warn!("Reading error: {:?}", err); + warn!("Reading error: {err:?}"); } } } @@ -202,6 +202,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/embassy/src/bin/logger-non-blocking.rs b/examples/embassy/src/bin/logger-non-blocking.rs index de45799..7f36514 100644 --- a/examples/embassy/src/bin/logger-non-blocking.rs +++ b/examples/embassy/src/bin/logger-non-blocking.rs @@ -144,6 +144,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/embassy/src/bin/pwm.rs b/examples/embassy/src/bin/pwm.rs index 7de4079..0f2f204 100644 --- a/examples/embassy/src/bin/pwm.rs +++ b/examples/embassy/src/bin/pwm.rs @@ -98,7 +98,7 @@ async fn main(_spawner: Spawner) -> ! { led.toggle().unwrap(); pwm.set_duty_cycle_percent(current_duty).unwrap(); - info!("Setting duty cycle to {}%", current_duty); + info!("Setting duty cycle to {current_duty}%"); current_duty += 5; if current_duty > 100 { current_duty = 0; @@ -152,6 +152,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/embassy/src/main.rs b/examples/embassy/src/main.rs index 82919bf..1d99002 100644 --- a/examples/embassy/src/main.rs +++ b/examples/embassy/src/main.rs @@ -131,6 +131,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index 9bc4654..4ca729a 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs" license = "MIT OR Apache-2.0" [dependencies] -cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" } +cortex-ar = "0.2" zynq7000-rt = { path = "../../zynq7000-rt" } zynq7000 = { path = "../../zynq7000" } zynq7000-hal = { path = "../../zynq7000-hal" } diff --git a/examples/simple/src/bin/gtc-ticks.rs b/examples/simple/src/bin/gtc-ticks.rs index f967777..0316ff7 100644 --- a/examples/simple/src/bin/gtc-ticks.rs +++ b/examples/simple/src/bin/gtc-ticks.rs @@ -131,6 +131,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/simple/src/bin/logger.rs b/examples/simple/src/bin/logger.rs index 5253898..46f4a68 100644 --- a/examples/simple/src/bin/logger.rs +++ b/examples/simple/src/bin/logger.rs @@ -77,13 +77,13 @@ pub fn main() -> ! { }; let boot_mode = BootMode::new(); - info!("Boot mode: {:?}", boot_mode); + info!("Boot mode: {boot_mode:?}"); let mut led = Output::new_for_mio(mio_pins.mio7, PinState::Low); loop { let gtc = gtc.read_timer(); info!("Hello, world!"); - info!("GTC ticks: {}", gtc); + info!("GTC ticks: {gtc}"); led.toggle().unwrap(); for _ in 0..5_000_000 { nop(); @@ -134,6 +134,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/zedboard/Cargo.toml b/examples/zedboard/Cargo.toml index db20ad7..0c1eb84 100644 --- a/examples/zedboard/Cargo.toml +++ b/examples/zedboard/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["no-std", "arm", "cortex-a", "amd", "zynq7000"] categories = ["embedded", "no-std", "hardware-support"] [dependencies] -cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", features = ["critical-section-single-core"] } +cortex-ar = "0.2" zynq7000-rt = { path = "../../zynq7000-rt" } zynq7000 = { path = "../../zynq7000" } zynq7000-hal = { path = "../../zynq7000-hal" } diff --git a/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs b/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs index 8d02e1e..2170d53 100644 --- a/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs +++ b/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs @@ -144,7 +144,7 @@ async fn main(_spawner: Spawner) -> ! { mio_led.toggle().unwrap(); let measurements = l3gd20.all().unwrap(); - info!("L3GD20: {:?}", measurements); + info!("L3GD20: {measurements:?}"); info!("L3GD20 Temp: {:?}", measurements.temp_celcius()); for led in emio_leds.iter_mut() { led.toggle().unwrap(); @@ -198,6 +198,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/zedboard/src/bin/l3gd20h-spi-mio.rs b/examples/zedboard/src/bin/l3gd20h-spi-mio.rs index f2afc8d..eada792 100644 --- a/examples/zedboard/src/bin/l3gd20h-spi-mio.rs +++ b/examples/zedboard/src/bin/l3gd20h-spi-mio.rs @@ -185,7 +185,7 @@ pub async fn blocking_application( let spi_dev = SpiWithHwCs::new(spi, spi::ChipSelect::Slave0, delay.clone()); let mut l3gd20 = l3gd20::spi::L3gd20::new(spi_dev).unwrap(); let who_am_i = l3gd20.who_am_i().unwrap(); - info!("L3GD20 WHO_AM_I: 0x{:02X}", who_am_i); + info!("L3GD20 WHO_AM_I: 0x{who_am_i:02X}"); let mut ticker = Ticker::every(Duration::from_millis(400)); @@ -195,7 +195,7 @@ pub async fn blocking_application( mio_led.toggle().unwrap(); let measurements = l3gd20.all().unwrap(); - info!("L3GD20: {:?}", measurements); + info!("L3GD20: {measurements:?}"); info!("L3GD20 Temp: {:?}", measurements.temp_celcius()); for led in emio_leds.iter_mut() { led.toggle().unwrap(); @@ -217,7 +217,7 @@ pub async fn non_blocking_application( .await .unwrap(); let who_am_i = l3gd20.who_am_i().await.unwrap(); - info!("L3GD20 WHO_AM_I: 0x{:02X}", who_am_i); + info!("L3GD20 WHO_AM_I: 0x{who_am_i:02X}"); let mut ticker = Ticker::every(Duration::from_millis(400)); @@ -227,7 +227,7 @@ pub async fn non_blocking_application( mio_led.toggle().unwrap(); let measurements = l3gd20.all().await.unwrap(); - info!("L3GD20: {:?}", measurements); + info!("L3GD20: {measurements:?}"); info!("L3GD20 Temp: {:?}", measurements.temp_celcius()); for led in emio_leds.iter_mut() { led.toggle().unwrap(); @@ -287,6 +287,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/zedboard/src/bin/uart-blocking.rs b/examples/zedboard/src/bin/uart-blocking.rs index 0b1535f..267b861 100644 --- a/examples/zedboard/src/bin/uart-blocking.rs +++ b/examples/zedboard/src/bin/uart-blocking.rs @@ -259,6 +259,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/zedboard/src/bin/uart-non-blocking.rs b/examples/zedboard/src/bin/uart-non-blocking.rs index 6305f58..0a0e846 100644 --- a/examples/zedboard/src/bin/uart-non-blocking.rs +++ b/examples/zedboard/src/bin/uart-non-blocking.rs @@ -309,7 +309,7 @@ async fn main(spawner: Spawner) -> ! { read_buf[i] = unsafe { uart_0_cons.dequeue_unchecked() }; }); if read_bytes > 0 { - info!("Received {} bytes on UART0", read_bytes); + info!("Received {read_bytes} bytes on UART0"); info!( "Data: {:?}", core::str::from_utf8(&read_buf[0..read_bytes]).unwrap() @@ -321,7 +321,7 @@ async fn main(spawner: Spawner) -> ! { read_buf[i] = unsafe { uartlite_cons.dequeue_unchecked() }; }); if read_bytes > 0 { - info!("Received {} bytes on UARTLITE", read_bytes); + info!("Received {read_bytes} bytes on UARTLITE"); info!( "Data: {:?}", core::str::from_utf8(&read_buf[0..read_bytes]).unwrap() @@ -333,7 +333,7 @@ async fn main(spawner: Spawner) -> ! { read_buf[i] = unsafe { uart16550_cons.dequeue_unchecked() }; }); if read_bytes > 0 { - info!("Received {} bytes on UART16550", read_bytes); + info!("Received {read_bytes} bytes on UART16550"); info!( "Data: {:?}", core::str::from_utf8(&read_buf[0..read_bytes]).unwrap() @@ -344,7 +344,7 @@ async fn main(spawner: Spawner) -> ! { } fn build_print_string(prefix: &str, base_str: &str) -> alloc::string::String { - format!("{} {}\n\r", prefix, base_str) + format!("{prefix} {base_str}\n\r") } #[embassy_executor::task] @@ -490,7 +490,7 @@ pub fn on_interrupt_axi_16550() { match int_id { axi_uart16550::registers::IntId2::ReceiverLineStatus => { let errors = rx.on_interrupt_receiver_line_status(iir); - warn!("Receiver line status error: {:?}", errors); + warn!("Receiver line status error: {errors:?}"); } axi_uart16550::registers::IntId2::RxDataAvailable | axi_uart16550::registers::IntId2::CharTimeout => { @@ -565,6 +565,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/examples/zedboard/src/main.rs b/examples/zedboard/src/main.rs index 2b3f28e..7e659b7 100644 --- a/examples/zedboard/src/main.rs +++ b/examples/zedboard/src/main.rs @@ -148,6 +148,6 @@ pub extern "C" fn _prefetch_handler() { /// Panic handler #[panic_handler] fn panic(info: &PanicInfo) -> ! { - error!("Panic: {:?}", info); + error!("Panic: {info:?}"); loop {} } diff --git a/zynq7000-hal/Cargo.toml b/zynq7000-hal/Cargo.toml index fda74ba..1e0aef9 100644 --- a/zynq7000-hal/Cargo.toml +++ b/zynq7000-hal/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["no-std", "hal", "amd", "zynq7000", "xilinx", "bare-metal"] categories = ["embedded", "no-std", "hardware-support"] [dependencies] -cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" } +cortex-ar = "0.2" zynq7000 = { path = "../zynq7000" } arbitrary-int = "1.3" diff --git a/zynq7000-hal/src/gpio/ll.rs b/zynq7000-hal/src/gpio/ll.rs index a05681d..5a85275 100644 --- a/zynq7000-hal/src/gpio/ll.rs +++ b/zynq7000-hal/src/gpio/ll.rs @@ -4,7 +4,7 @@ use zynq7000::gpio::{Gpio, MaskedOutput, MmioGpio}; use crate::slcr::Slcr; -use super::{mio::MuxConf, PinIsOutputOnly}; +use super::{PinIsOutputOnly, mio::MuxConf}; #[derive(Debug, Clone, Copy)] pub enum PinOffset { diff --git a/zynq7000-hal/src/gpio/mod.rs b/zynq7000-hal/src/gpio/mod.rs index 60cc5d1..fca11cc 100644 --- a/zynq7000-hal/src/gpio/mod.rs +++ b/zynq7000-hal/src/gpio/mod.rs @@ -172,7 +172,8 @@ impl Flex { pub fn configure_as_output_open_drain(&mut self, level: PinState, with_internal_pullup: bool) { self.mode = PinMode::OutputOpenDrain; - self.ll.configure_as_output_open_drain(level, with_internal_pullup); + self.ll + .configure_as_output_open_drain(level, with_internal_pullup); } /// If the pin is configured as an input pin, this function does nothing. diff --git a/zynq7000-rt/Cargo.toml b/zynq7000-rt/Cargo.toml index 50ca596..415dd56 100644 --- a/zynq7000-rt/Cargo.toml +++ b/zynq7000-rt/Cargo.toml @@ -11,8 +11,8 @@ keywords = ["no-std", "arm", "cortex-a", "amd", "zynq7000"] categories = ["embedded", "no-std", "hardware-support"] [dependencies] -cortex-a-rt = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", optional = true, features = ["vfp-dp"] } -cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" } +cortex-a-rt = { version = "0.1", optional = true, features = ["vfp-dp"] } +cortex-ar = "0.2" [features] default = ["rt"] diff --git a/zynq7000/Cargo.toml b/zynq7000/Cargo.toml index 406031a..2bcaba7 100644 --- a/zynq7000/Cargo.toml +++ b/zynq7000/Cargo.toml @@ -12,7 +12,7 @@ categories = ["embedded", "no-std", "hardware-support"] [dependencies] static_assertions = "1.1" -derive-mmio = { git = "https://github.com/us-irs/derive-mmio", branch = "inner-mmio-by-shared-ref", default-features = false } +derive-mmio = { version = "0.5", default-features = false } bitbybit = "1.3" arbitrary-int = "1.3" rustversion = "1"