From 77e0b918db2a33d8fe5dfe02acb4c8fef90f8e9c Mon Sep 17 00:00:00 2001
From: Dion Dokter <diondokter@gmail.com>
Date: Mon, 28 Jul 2025 09:51:29 +0200
Subject: Impl multiwrite trait for concat flash

---
 embassy-embedded-hal/src/flash/concat_flash.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'embassy-embedded-hal/src')

diff --git a/embassy-embedded-hal/src/flash/concat_flash.rs b/embassy-embedded-hal/src/flash/concat_flash.rs
index 499941d19..fe5a18ce2 100644
--- a/embassy-embedded-hal/src/flash/concat_flash.rs
+++ b/embassy-embedded-hal/src/flash/concat_flash.rs
@@ -1,5 +1,7 @@
-use embedded_storage::nor_flash::{ErrorType, NorFlash, NorFlashError, ReadNorFlash};
-use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash};
+use embedded_storage::nor_flash::{ErrorType, MultiwriteNorFlash, NorFlash, NorFlashError, ReadNorFlash};
+use embedded_storage_async::nor_flash::{
+    MultiwriteNorFlash as AsyncMultiwriteNorFlash, NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash,
+};
 
 /// Convenience helper for concatenating two consecutive flashes into one.
 /// This is especially useful if used with "flash regions", where one may
@@ -116,6 +118,14 @@ where
     }
 }
 
+impl<First, Second, E> MultiwriteNorFlash for ConcatFlash<First, Second>
+where
+    First: MultiwriteNorFlash<Error = E>,
+    Second: MultiwriteNorFlash<Error = E>,
+    E: NorFlashError,
+{
+}
+
 impl<First, Second, E> AsyncReadNorFlash for ConcatFlash<First, Second>
 where
     First: AsyncReadNorFlash<Error = E>,
@@ -185,6 +195,14 @@ where
     }
 }
 
+impl<First, Second, E> AsyncMultiwriteNorFlash for ConcatFlash<First, Second>
+where
+    First: AsyncMultiwriteNorFlash<Error = E>,
+    Second: AsyncMultiwriteNorFlash<Error = E>,
+    E: NorFlashError,
+{
+}
+
 #[cfg(test)]
 mod tests {
     use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
-- 
cgit