aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Melchior Jacobsen <[email protected]>2023-05-25 22:32:57 +0200
committerRasmus Melchior Jacobsen <[email protected]>2023-05-25 22:32:57 +0200
commitb50d04336ee3608e36545908cbf45969e81c9807 (patch)
treed0b4a890f0a87febe74654e6fe15434bf8b5a2dd
parentce331b411c3a6c69fbfefa968319f8eba5ad813f (diff)
Fix merge error
-rw-r--r--embassy-stm32/src/flash/common.rs9
1 files changed, 0 insertions, 9 deletions
diff --git a/embassy-stm32/src/flash/common.rs b/embassy-stm32/src/flash/common.rs
index 35f5a464c..400831e0a 100644
--- a/embassy-stm32/src/flash/common.rs
+++ b/embassy-stm32/src/flash/common.rs
@@ -83,15 +83,6 @@ impl interrupt::Handler<crate::interrupt::FLASH> for InterruptHandler {
83 } 83 }
84} 84}
85 85
86/// Interrupt handler
87pub struct InterruptHandler;
88
89impl interrupt::Handler<crate::interrupt::FLASH> for InterruptHandler {
90 unsafe fn on_interrupt() {
91 family::on_interrupt();
92 }
93}
94
95pub(super) fn blocking_read(base: u32, size: u32, offset: u32, bytes: &mut [u8]) -> Result<(), Error> { 86pub(super) fn blocking_read(base: u32, size: u32, offset: u32, bytes: &mut [u8]) -> Result<(), Error> {
96 if offset + bytes.len() as u32 > size { 87 if offset + bytes.len() as u32 > size {
97 return Err(Error::Size); 88 return Err(Error::Size);