aboutsummaryrefslogtreecommitdiff
path: root/embassy-boot/boot/src/boot_loader.rs
diff options
context:
space:
mode:
authorKaitlyn Kenwell <[email protected]>2023-12-13 14:40:49 -0500
committerKaitlyn Kenwell <[email protected]>2023-12-13 14:40:49 -0500
commit976a7ae22aa222213861c12d515115aac87bd2e0 (patch)
tree88f802c7d57df011c02142ef309ff5cffe8bd3b0 /embassy-boot/boot/src/boot_loader.rs
parent14f41a71b6ea9dedb4ee5b9c741fe10575772c7d (diff)
Add embassy-usb-dfu
Diffstat (limited to 'embassy-boot/boot/src/boot_loader.rs')
-rw-r--r--embassy-boot/boot/src/boot_loader.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/embassy-boot/boot/src/boot_loader.rs b/embassy-boot/boot/src/boot_loader.rs
index a8c19197b..c0deca22b 100644
--- a/embassy-boot/boot/src/boot_loader.rs
+++ b/embassy-boot/boot/src/boot_loader.rs
@@ -5,7 +5,7 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
5use embassy_sync::blocking_mutex::Mutex; 5use embassy_sync::blocking_mutex::Mutex;
6use embedded_storage::nor_flash::{NorFlash, NorFlashError, NorFlashErrorKind}; 6use embedded_storage::nor_flash::{NorFlash, NorFlashError, NorFlashErrorKind};
7 7
8use crate::{State, BOOT_MAGIC, STATE_ERASE_VALUE, SWAP_MAGIC}; 8use crate::{State, BOOT_MAGIC, STATE_ERASE_VALUE, SWAP_MAGIC, DFU_DETACH_MAGIC};
9 9
10/// Errors returned by bootloader 10/// Errors returned by bootloader
11#[derive(PartialEq, Eq, Debug)] 11#[derive(PartialEq, Eq, Debug)]
@@ -384,6 +384,8 @@ impl<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash> BootLoader<ACTIVE, DFU, S
384 384
385 if !state_word.iter().any(|&b| b != SWAP_MAGIC) { 385 if !state_word.iter().any(|&b| b != SWAP_MAGIC) {
386 Ok(State::Swap) 386 Ok(State::Swap)
387 } else if !state_word.iter().any(|&b| b != DFU_DETACH_MAGIC) {
388 Ok(State::DfuDetach)
387 } else { 389 } else {
388 Ok(State::Boot) 390 Ok(State::Boot)
389 } 391 }