aboutsummaryrefslogtreecommitdiff
path: root/embassy-embedded-hal/src/flash
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-embedded-hal/src/flash')
-rw-r--r--embassy-embedded-hal/src/flash/concat_flash.rs3
-rw-r--r--embassy-embedded-hal/src/flash/mem_flash.rs3
-rw-r--r--embassy-embedded-hal/src/flash/partition/mod.rs2
3 files changed, 0 insertions, 8 deletions
diff --git a/embassy-embedded-hal/src/flash/concat_flash.rs b/embassy-embedded-hal/src/flash/concat_flash.rs
index 1ea84269c..499941d19 100644
--- a/embassy-embedded-hal/src/flash/concat_flash.rs
+++ b/embassy-embedded-hal/src/flash/concat_flash.rs
@@ -1,5 +1,4 @@
1use embedded_storage::nor_flash::{ErrorType, NorFlash, NorFlashError, ReadNorFlash}; 1use embedded_storage::nor_flash::{ErrorType, NorFlash, NorFlashError, ReadNorFlash};
2#[cfg(feature = "nightly")]
3use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; 2use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash};
4 3
5/// Convenience helper for concatenating two consecutive flashes into one. 4/// Convenience helper for concatenating two consecutive flashes into one.
@@ -117,7 +116,6 @@ where
117 } 116 }
118} 117}
119 118
120#[cfg(feature = "nightly")]
121impl<First, Second, E> AsyncReadNorFlash for ConcatFlash<First, Second> 119impl<First, Second, E> AsyncReadNorFlash for ConcatFlash<First, Second>
122where 120where
123 First: AsyncReadNorFlash<Error = E>, 121 First: AsyncReadNorFlash<Error = E>,
@@ -146,7 +144,6 @@ where
146 } 144 }
147} 145}
148 146
149#[cfg(feature = "nightly")]
150impl<First, Second, E> AsyncNorFlash for ConcatFlash<First, Second> 147impl<First, Second, E> AsyncNorFlash for ConcatFlash<First, Second>
151where 148where
152 First: AsyncNorFlash<Error = E>, 149 First: AsyncNorFlash<Error = E>,
diff --git a/embassy-embedded-hal/src/flash/mem_flash.rs b/embassy-embedded-hal/src/flash/mem_flash.rs
index afb0d1a15..d24c61823 100644
--- a/embassy-embedded-hal/src/flash/mem_flash.rs
+++ b/embassy-embedded-hal/src/flash/mem_flash.rs
@@ -1,7 +1,6 @@
1use alloc::vec::Vec; 1use alloc::vec::Vec;
2 2
3use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; 3use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash};
4#[cfg(feature = "nightly")]
5use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; 4use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash};
6 5
7extern crate alloc; 6extern crate alloc;
@@ -93,7 +92,6 @@ impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> NorFla
93 } 92 }
94} 93}
95 94
96#[cfg(feature = "nightly")]
97impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> AsyncReadNorFlash 95impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> AsyncReadNorFlash
98 for MemFlash<SIZE, ERASE_SIZE, WRITE_SIZE> 96 for MemFlash<SIZE, ERASE_SIZE, WRITE_SIZE>
99{ 97{
@@ -109,7 +107,6 @@ impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> AsyncR
109 } 107 }
110} 108}
111 109
112#[cfg(feature = "nightly")]
113impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> AsyncNorFlash 110impl<const SIZE: usize, const ERASE_SIZE: usize, const WRITE_SIZE: usize> AsyncNorFlash
114 for MemFlash<SIZE, ERASE_SIZE, WRITE_SIZE> 111 for MemFlash<SIZE, ERASE_SIZE, WRITE_SIZE>
115{ 112{
diff --git a/embassy-embedded-hal/src/flash/partition/mod.rs b/embassy-embedded-hal/src/flash/partition/mod.rs
index 42c8a308d..6177ed9ab 100644
--- a/embassy-embedded-hal/src/flash/partition/mod.rs
+++ b/embassy-embedded-hal/src/flash/partition/mod.rs
@@ -2,11 +2,9 @@
2 2
3use embedded_storage::nor_flash::{NorFlashError, NorFlashErrorKind}; 3use embedded_storage::nor_flash::{NorFlashError, NorFlashErrorKind};
4 4
5#[cfg(feature = "nightly")]
6mod asynch; 5mod asynch;
7mod blocking; 6mod blocking;
8 7
9#[cfg(feature = "nightly")]
10pub use asynch::Partition; 8pub use asynch::Partition;
11pub use blocking::BlockingPartition; 9pub use blocking::BlockingPartition;
12 10