From e966125d62db32ba4ca7136d96a31d2cb7e7775d Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Tue, 19 Apr 2022 14:39:59 +0200 Subject: Add embedded-storage trait impls for QSPI * Adds implementations of embedded-storage and embedded-storage-async for QSPI * Add blocking implementations of QSPI * Use blocking implementation in new() and embedded-storage impls * Use async implementation in embedded-storage-async impls * Add FLASH_SIZE const generic parameter * Own IRQ in Qspi to disable it on drop --- examples/nrf/src/bin/qspi.rs | 5 ++--- examples/nrf/src/bin/qspi_lowpower.rs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'examples/nrf/src') diff --git a/examples/nrf/src/bin/qspi.rs b/examples/nrf/src/bin/qspi.rs index ba60716c8..8673b7961 100644 --- a/examples/nrf/src/bin/qspi.rs +++ b/examples/nrf/src/bin/qspi.rs @@ -26,10 +26,9 @@ async fn main(_spawner: Spawner, p: Peripherals) { config.write_page_size = qspi::WritePageSize::_256BYTES; let irq = interrupt::take!(QSPI); - let mut q = qspi::Qspi::new( + let mut q: qspi::Qspi<_, 67108864> = qspi::Qspi::new( p.QSPI, irq, p.P0_19, p.P0_17, p.P0_20, p.P0_21, p.P0_22, p.P0_23, config, - ) - .await; + ); let mut id = [1; 3]; unwrap!(q.custom_instruction(0x9F, &[], &mut id).await); diff --git a/examples/nrf/src/bin/qspi_lowpower.rs b/examples/nrf/src/bin/qspi_lowpower.rs index a8184cd63..255ce5d5e 100644 --- a/examples/nrf/src/bin/qspi_lowpower.rs +++ b/examples/nrf/src/bin/qspi_lowpower.rs @@ -32,7 +32,7 @@ async fn main(_spawner: Spawner, mut p: Peripherals) { exit_time: 3, // tRDP = 35uS }); - let mut q = qspi::Qspi::new( + let mut q: qspi::Qspi<_, 67108864> = qspi::Qspi::new( &mut p.QSPI, &mut irq, &mut p.P0_19, @@ -42,8 +42,7 @@ async fn main(_spawner: Spawner, mut p: Peripherals) { &mut p.P0_22, &mut p.P0_23, config, - ) - .await; + ); let mut id = [1; 3]; unwrap!(q.custom_instruction(0x9F, &[], &mut id).await); -- cgit