Merge #387

bors[bot] · diondokter · web-flow · commit 5233608409b1 · 2022-05-19T14:33:34.000Z
387: Fixed nvms erase problem for nrf91 &amp; nrf53 r=jamesmunns a=diondokter

A byte offset was given where a word offset was required (factor 4 difference)

Co-authored-by: Dion Dokter &lt;diondokter@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-(no changes)
+- Fixed the nvmc erase procedure on nRF91 & nRF53 ([#387])
 
 ## [0.15.0]
 
diff --git a/nrf-hal-common/src/nvmc.rs b/nrf-hal-common/src/nvmc.rs
@@ -87,7 +87,7 @@ where
     #[cfg(any(feature = "9160", feature = "5340-app"))]
     #[inline]
     fn erase_page(&mut self, page_offset: usize) {
-        self.direct_write_word(page_offset * PAGE_SIZE, 0xffffffff);
+        self.direct_write_word(page_offset * PAGE_SIZE / WORD_SIZE, 0xffffffff);
         self.wait_ready();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ where`
`87`	`87`	`#[cfg(any(feature = "9160", feature = "5340-app"))]`
`88`	`88`	`#[inline]`
`89`	`89`	`fn erase_page(&mut self, page_offset: usize) {`
`90`		`- self.direct_write_word(page_offset * PAGE_SIZE, 0xffffffff);`
	`90`	`+ self.direct_write_word(page_offset * PAGE_SIZE / WORD_SIZE, 0xffffffff);`
`91`	`91`	`self.wait_ready();`
`92`	`92`	`}`
`93`	`93`