2 files changed, 19 insertions, 19 deletions

diff --git a/examples/boot/application/rp/src/bin/a.rs b/examples/boot/application/rp/src/bin/a.rs
index f0dda39d0..15fdaca82 100644
--- a/examples/boot/application/rp/src/bin/a.rs
+++ b/examples/boot/application/rp/src/bin/a.rs
@@ -7,7 +7,7 @@ use core::cell::RefCell;
 use defmt_rtt as _;
 use embassy_boot_rp::*;
 use embassy_executor::Spawner;
-use embassy_rp::flash::{self, Flash};
+use embassy_rp::flash::Flash;
 use embassy_rp::gpio::{Level, Output};
 use embassy_rp::watchdog::Watchdog;
 use embassy_sync::blocking_mutex::Mutex;
@@ -34,7 +34,7 @@ async fn main(_s: Spawner) {
     let mut watchdog = Watchdog::new(p.WATCHDOG);
     watchdog.start(Duration::from_secs(8));
 
-    let flash = Flash::<_, flash::Blocking, FLASH_SIZE>::new(p.FLASH);
+    let flash = Flash::<_, _, FLASH_SIZE>::new_blocking(p.FLASH);
     let flash = Mutex::new(RefCell::new(flash));
 
     let config = FirmwareUpdaterConfig::from_linkerfile_blocking(&flash);
diff --git a/examples/rp/src/bin/flash.rs b/examples/rp/src/bin/flash.rs
index 88bb931d2..911a657eb 100644
--- a/examples/rp/src/bin/flash.rs
+++ b/examples/rp/src/bin/flash.rs
@@ -28,12 +28,12 @@ async fn main(_spawner: Spawner) {
     let mut flash = embassy_rp::flash::Flash::<_, Async, FLASH_SIZE>::new(p.FLASH, p.DMA_CH0);
 
     // Get JEDEC id
-    let jedec = flash.jedec_id().unwrap();
+    let jedec = flash.blocking_jedec_id().unwrap();
     info!("jedec id: 0x{:x}", jedec);
 
     // Get unique id
     let mut uid = [0; 8];
-    flash.unique_id(&mut uid).unwrap();
+    flash.blocking_unique_id(&mut uid).unwrap();
     info!("unique id: {:?}", uid);
 
     erase_write_sector(&mut flash, 0x00);
@@ -48,25 +48,25 @@ async fn main(_spawner: Spawner) {
 fn multiwrite_bytes(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async, FLASH_SIZE>, offset: u32) {
     info!(">>>> [multiwrite_bytes]");
     let mut read_buf = [0u8; ERASE_SIZE];
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut read_buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut read_buf));
 
     info!("Addr of flash block is {:x}", ADDR_OFFSET + offset + FLASH_BASE as u32);
     info!("Contents start with {=[u8]}", read_buf[0..4]);
 
-    defmt::unwrap!(flash.erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
+    defmt::unwrap!(flash.blocking_erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
 
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut read_buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut read_buf));
     info!("Contents after erase starts with {=[u8]}", read_buf[0..4]);
     if read_buf.iter().any(|x| *x != 0xFF) {
         defmt::panic!("unexpected");
     }
 
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset, &[0x01]));
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset + 1, &[0x02]));
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset + 2, &[0x03]));
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset + 3, &[0x04]));
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset, &[0x01]));
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset + 1, &[0x02]));
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset + 2, &[0x03]));
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset + 3, &[0x04]));
 
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut read_buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut read_buf));
     info!("Contents after write starts with {=[u8]}", read_buf[0..4]);
     if &read_buf[0..4] != &[0x01, 0x02, 0x03, 0x04] {
         defmt::panic!("unexpected");
@@ -76,14 +76,14 @@ fn multiwrite_bytes(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async, FLASH
 fn erase_write_sector(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async, FLASH_SIZE>, offset: u32) {
     info!(">>>> [erase_write_sector]");
     let mut buf = [0u8; ERASE_SIZE];
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut buf));
 
     info!("Addr of flash block is {:x}", ADDR_OFFSET + offset + FLASH_BASE as u32);
     info!("Contents start with {=[u8]}", buf[0..4]);
 
-    defmt::unwrap!(flash.erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
+    defmt::unwrap!(flash.blocking_erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
 
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut buf));
     info!("Contents after erase starts with {=[u8]}", buf[0..4]);
     if buf.iter().any(|x| *x != 0xFF) {
         defmt::panic!("unexpected");
@@ -93,9 +93,9 @@ fn erase_write_sector(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async, FLA
         *b = 0xDA;
     }
 
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset, &buf));
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset, &buf));
 
-    defmt::unwrap!(flash.read(ADDR_OFFSET + offset, &mut buf));
+    defmt::unwrap!(flash.blocking_read(ADDR_OFFSET + offset, &mut buf));
     info!("Contents after write starts with {=[u8]}", buf[0..4]);
     if buf.iter().any(|x| *x != 0xDA) {
         defmt::panic!("unexpected");
@@ -111,7 +111,7 @@ async fn background_read(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async,
     info!("Addr of flash block is {:x}", ADDR_OFFSET + offset + FLASH_BASE as u32);
     info!("Contents start with {=u32:x}", buf[0]);
 
-    defmt::unwrap!(flash.erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
+    defmt::unwrap!(flash.blocking_erase(ADDR_OFFSET + offset, ADDR_OFFSET + offset + ERASE_SIZE as u32));
 
     defmt::unwrap!(flash.background_read(ADDR_OFFSET + offset, &mut buf)).await;
     info!("Contents after erase starts with {=u32:x}", buf[0]);
@@ -123,7 +123,7 @@ async fn background_read(flash: &mut embassy_rp::flash::Flash<'_, FLASH, Async,
         *b = 0xDABA1234;
     }
 
-    defmt::unwrap!(flash.write(ADDR_OFFSET + offset, unsafe {
+    defmt::unwrap!(flash.blocking_write(ADDR_OFFSET + offset, unsafe {
         core::slice::from_raw_parts(buf.as_ptr() as *const u8, buf.len() * 4)
     }));