Update embedded-{dma,storage}

Author: Jonas Schievink

examples/nvmc-demo/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
-embedded-storage = "0.2.0"
+embedded-storage = "0.3.0"
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 panic-probe = { version = "0.3.0", features = ["print-rtt"] }
 

nrf-hal-common/Cargo.toml

@@ -25,8 +25,8 @@ nb = "1.0.0"
 fixed = "1.0.0"
 rand_core = "0.6.3"
 cfg-if = "1.0.0"
-embedded-dma = "0.1.1"
-embedded-storage = "0.2.0"
+embedded-dma = "0.2.0"
+embedded-storage = "0.3.0"
 
 [dependencies.void]
 default-features = false

nrf-hal-common/src/nvmc.rs

@@ -12,7 +12,9 @@ use crate::pac::NVMC;
 use crate::pac::NVMC_NS as NVMC;
 
 use core::convert::TryInto;
-use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
+use embedded_storage::nor_flash::{
+    ErrorType, NorFlash, NorFlashError, NorFlashErrorKind, ReadNorFlash,
+};
 
 type WORD = u32;
 const WORD_SIZE: usize = core::mem::size_of::<WORD>();
@@ -108,12 +110,14 @@ where
     }
 }
 
+impl<T: Instance> ErrorType for Nvmc<T> {
+    type Error = NvmcError;
+}
+
 impl<T> ReadNorFlash for Nvmc<T>
 where
     T: Instance,
 {
-    type Error = NvmcError;
-
     const READ_SIZE: usize = 1;
 
     fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> {
@@ -208,3 +212,12 @@ pub enum NvmcError {
     /// An operation was attempted outside the boundaries
     OutOfBounds,
 }
+
+impl NorFlashError for NvmcError {
+    fn kind(&self) -> NorFlashErrorKind {
+        match self {
+            NvmcError::Unaligned => NorFlashErrorKind::NotAligned,
+            NvmcError::OutOfBounds => NorFlashErrorKind::OutOfBounds,
+        }
+    }
+}

nrf52840-hal-tests/Cargo.toml

@@ -34,6 +34,6 @@ cortex-m-rt = { version = "0.7.1", features = ["device"] }
 defmt = "0.3.0"
 defmt-rtt = "0.3.0"
 defmt-test = "0.3.0"
-embedded-storage = "0.2.0"
+embedded-storage = "0.3.0"
 nrf52840-hal = { path = "../nrf52840-hal" }
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }