aboutsummaryrefslogtreecommitdiff
path: root/embassy-rp/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-06-29 22:37:11 +0200
committerDario Nieuwenhuis <[email protected]>2025-07-04 00:23:22 +0200
commit72248a601a9ea28ac696f186e2cbe4c2f128a133 (patch)
tree109eca1e791766d62237056f9fa4a5a37a7b9d63 /embassy-rp/src
parentb964bee302fc3631d14d73d9a9b406e7352cd550 (diff)
Update Rust nightly, stable.
Diffstat (limited to 'embassy-rp/src')
-rw-r--r--embassy-rp/src/flash.rs6
-rw-r--r--embassy-rp/src/relocate.rs2
2 files changed, 6 insertions, 2 deletions
diff --git a/embassy-rp/src/flash.rs b/embassy-rp/src/flash.rs
index ef1cd9212..8c809090e 100644
--- a/embassy-rp/src/flash.rs
+++ b/embassy-rp/src/flash.rs
@@ -482,7 +482,11 @@ mod ram_helpers {
482 /// # Safety 482 /// # Safety
483 /// 483 ///
484 /// `boot2` must contain a valid 2nd stage boot loader which can be called to re-initialize XIP mode 484 /// `boot2` must contain a valid 2nd stage boot loader which can be called to re-initialize XIP mode
485 unsafe fn flash_function_pointers_with_boot2(erase: bool, write: bool, boot2: &[u32; 64]) -> FlashFunctionPointers { 485 unsafe fn flash_function_pointers_with_boot2(
486 erase: bool,
487 write: bool,
488 boot2: &[u32; 64],
489 ) -> FlashFunctionPointers<'_> {
486 let boot2_fn_ptr = (boot2 as *const u32 as *const u8).offset(1); 490 let boot2_fn_ptr = (boot2 as *const u32 as *const u8).offset(1);
487 let boot2_fn: unsafe extern "C" fn() -> () = core::mem::transmute(boot2_fn_ptr); 491 let boot2_fn: unsafe extern "C" fn() -> () = core::mem::transmute(boot2_fn_ptr);
488 FlashFunctionPointers { 492 FlashFunctionPointers {
diff --git a/embassy-rp/src/relocate.rs b/embassy-rp/src/relocate.rs
index 34487819f..6ff40ddd7 100644
--- a/embassy-rp/src/relocate.rs
+++ b/embassy-rp/src/relocate.rs
@@ -39,7 +39,7 @@ pub struct RelocatedProgram<'a, const PROGRAM_SIZE: usize> {
39} 39}
40 40
41impl<'a, const PROGRAM_SIZE: usize> RelocatedProgram<'a, PROGRAM_SIZE> { 41impl<'a, const PROGRAM_SIZE: usize> RelocatedProgram<'a, PROGRAM_SIZE> {
42 pub fn new_with_origin(program: &Program<PROGRAM_SIZE>, origin: u8) -> RelocatedProgram<PROGRAM_SIZE> { 42 pub fn new_with_origin(program: &Program<PROGRAM_SIZE>, origin: u8) -> RelocatedProgram<'_, PROGRAM_SIZE> {
43 RelocatedProgram { program, origin } 43 RelocatedProgram { program, origin }
44 } 44 }
45 45