max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #956

Browse Source 
956: Remove BootFlash borrow r=lulf a=lulf

Compiler will infer a different lifetime for BootFlash than for the borrowed flash, which makes it require more type annotations than if it was just owning the type. Since it doesn't really matter if it owns or borrows in practical use, change it to own so that it simplifies usage.

Co-authored-by: Ulf Lilleengen <ulf.lilleengen@gmail.com>
This commit is contained in:
bors[bot] 2022-09-20 07:55:20 +00:00 committed by GitHub
commit 11da25800b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
embassy-boot/boot/src/lib.rs
View File

@ -447,24 +447,24 @@ where
} }
/// A flash wrapper implementing the Flash and embedded_storage traits. /// A flash wrapper implementing the Flash and embedded_storage traits.
pub struct BootFlash<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8 = 0xFF> pub struct BootFlash<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8 = 0xFF>
where where
F: NorFlash + ReadNorFlash, F: NorFlash + ReadNorFlash,
{ {
flash: &'a mut F, flash: F,
} }
impl<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> BootFlash<'a, F, BLOCK_SIZE, ERASE_VALUE> impl<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> BootFlash<F, BLOCK_SIZE, ERASE_VALUE>
where where
F: NorFlash + ReadNorFlash, F: NorFlash + ReadNorFlash,
{ {
/// Create a new instance of a bootable flash /// Create a new instance of a bootable flash
pub fn new(flash: &'a mut F) -> Self { pub fn new(flash: F) -> Self {
Self { flash } Self { flash }
} }
} }
impl<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> Flash for BootFlash<'a, F, BLOCK_SIZE, ERASE_VALUE> impl<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> Flash for BootFlash<F, BLOCK_SIZE, ERASE_VALUE>
where where
F: NorFlash + ReadNorFlash, F: NorFlash + ReadNorFlash,
{ {
@ -472,14 +472,14 @@ where
const ERASE_VALUE: u8 = ERASE_VALUE; const ERASE_VALUE: u8 = ERASE_VALUE;
} }
impl<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> ErrorType for BootFlash<'a, F, BLOCK_SIZE, ERASE_VALUE> impl<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> ErrorType for BootFlash<F, BLOCK_SIZE, ERASE_VALUE>
where where
F: ReadNorFlash + NorFlash, F: ReadNorFlash + NorFlash,
{ {
type Error = F::Error; type Error = F::Error;
} }
impl<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> NorFlash for BootFlash<'a, F, BLOCK_SIZE, ERASE_VALUE> impl<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> NorFlash for BootFlash<F, BLOCK_SIZE, ERASE_VALUE>
where where
F: ReadNorFlash + NorFlash, F: ReadNorFlash + NorFlash,
{ {
@ -487,26 +487,26 @@ where
const ERASE_SIZE: usize = F::ERASE_SIZE; const ERASE_SIZE: usize = F::ERASE_SIZE;
fn erase(&mut self, from: u32, to: u32) -> Result<(), Self::Error> { fn erase(&mut self, from: u32, to: u32) -> Result<(), Self::Error> {
F::erase(self.flash, from, to) F::erase(&mut self.flash, from, to)
} }
fn write(&mut self, offset: u32, bytes: &[u8]) -> Result<(), Self::Error> { fn write(&mut self, offset: u32, bytes: &[u8]) -> Result<(), Self::Error> {
F::write(self.flash, offset, bytes) F::write(&mut self.flash, offset, bytes)
} }
} }
impl<'a, F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> ReadNorFlash for BootFlash<'a, F, BLOCK_SIZE, ERASE_VALUE> impl<F, const BLOCK_SIZE: usize, const ERASE_VALUE: u8> ReadNorFlash for BootFlash<F, BLOCK_SIZE, ERASE_VALUE>
where where
F: ReadNorFlash + NorFlash, F: ReadNorFlash + NorFlash,
{ {
const READ_SIZE: usize = F::READ_SIZE; const READ_SIZE: usize = F::READ_SIZE;
fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> { fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> {
F::read(self.flash, offset, bytes) F::read(&mut self.flash, offset, bytes)
} }
fn capacity(&self) -> usize { fn capacity(&self) -> usize {
F::capacity(self.flash) F::capacity(&self.flash)
} }
} }

2
examples/boot/bootloader/nrf/src/main.rs
View File

@ -21,7 +21,7 @@ fn main() -> ! {
let mut bl = BootLoader::default(); let mut bl = BootLoader::default();
let start = bl.prepare(&mut SingleFlashConfig::new(&mut BootFlash::<_, 4096>::new( let start = bl.prepare(&mut SingleFlashConfig::new(&mut BootFlash::<_, 4096>::new(
&mut WatchdogFlash::start(Nvmc::new(p.NVMC), p.WDT, 5), WatchdogFlash::start(Nvmc::new(p.NVMC), p.WDT, 5),
))); )));
unsafe { bl.load(start) } unsafe { bl.load(start) }
} }

7
examples/boot/bootloader/stm32/src/main.rs
View File

@ -20,10 +20,9 @@ fn main() -> ! {
*/ */
let mut bl: BootLoader<ERASE_SIZE, WRITE_SIZE> = BootLoader::default(); let mut bl: BootLoader<ERASE_SIZE, WRITE_SIZE> = BootLoader::default();
let mut flash = Flash::unlock(p.FLASH); let flash = Flash::unlock(p.FLASH);
let start = bl.prepare(&mut SingleFlashConfig::new( let mut flash = BootFlash::<_, ERASE_SIZE, ERASE_VALUE>::new(flash);
&mut BootFlash::<_, ERASE_SIZE, ERASE_VALUE>::new(&mut flash), let start = bl.prepare(&mut SingleFlashConfig::new(&mut flash));
));
core::mem::drop(flash); core::mem::drop(flash);
unsafe { bl.load(start) } unsafe { bl.load(start) }
} }