Merge pull request #693 from quartiq/feature/embedded-storage-update

Updating to embedded-storage 0.3

Author: burrbull

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - complete and rework Dma Stream API [#666]
  - SPI bidi takes 2 pins [#526]
  - `Fast Read Quad I/O (EBh)` in `qspi-w25q` example now matches W25QXX datasheet. [#682]
+ - `embedded-storage` version bumped to 0.3
 
 ### Fixed
 

Cargo.toml

@@ -47,7 +47,7 @@ fugit-timer = "0.1.3"
 rtic-monotonic = { version = "1.0", optional = true }
 systick-monotonic = { version = "1.0", optional = true }
 bitflags = "2.2"
-embedded-storage = "0.2"
+embedded-storage = "0.3"
 vcell = "0.1.3"
 
 [dependencies.time]

src/flash.rs

@@ -1,4 +1,6 @@
-use embedded_storage::nor_flash::{MultiwriteNorFlash, NorFlash, ReadNorFlash};
+use embedded_storage::nor_flash::{
+    ErrorType, MultiwriteNorFlash, NorFlash, NorFlashError, NorFlashErrorKind, ReadNorFlash,
+};
 
 use crate::pac::FLASH;
 use crate::signature::FlashSize;
@@ -357,9 +359,24 @@ pub fn flash_sectors(flash_size: usize, dual_bank: bool) -> impl Iterator<Item =
     }
 }
 
-impl ReadNorFlash for LockedFlash {
+impl NorFlashError for Error {
+    fn kind(&self) -> NorFlashErrorKind {
+        match self {
+            Error::ProgrammingAlignment => NorFlashErrorKind::NotAligned,
+            _ => NorFlashErrorKind::Other,
+        }
+    }
+}
+
+impl ErrorType for LockedFlash {
+    type Error = Error;
+}
+
+impl ErrorType for UnlockedFlash<'_> {
     type Error = Error;
+}
 
+impl ReadNorFlash for LockedFlash {
     const READ_SIZE: usize = 1;
 
     fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> {
@@ -374,8 +391,6 @@ impl ReadNorFlash for LockedFlash {
 }
 
 impl<'a> ReadNorFlash for UnlockedFlash<'a> {
-    type Error = Error;
-
     const READ_SIZE: usize = 1;
 
     fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> {