Simplify VFS initialization

Nitrokey · Dec 10, 2024 · 8432401 · 8432401
1 parent 8bfc4fb
commit 8432401
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/components/boards/src/store.rs b/components/boards/src/store.rs
@@ -1,6 +1,7 @@
 use core::{
     marker::PhantomData,
     mem::MaybeUninit,
+    ptr::addr_of_mut,
     sync::atomic::{AtomicBool, Ordering},
 };
 
@@ -194,17 +195,17 @@ pub fn init_store<B: Board>(
         .compare_exchange_weak(false, true, Ordering::AcqRel, Ordering::Acquire)
         .expect("multiple instances of RunnerStore are not allowed");
 
-    static mut VOLATILE_STORAGE: Option<VolatileStorage> = None;
-    static mut VOLATILE_FS_ALLOC: Option<Allocation<VolatileStorage>> = None;
-    static mut VOLATILE_FS: Option<Filesystem<VolatileStorage>> = None;
+    static mut VOLATILE_STORAGE: MaybeUninit<VolatileStorage> = MaybeUninit::uninit();
+    static mut VOLATILE_FS_ALLOC: MaybeUninit<Allocation<VolatileStorage>> = MaybeUninit::uninit();
+    static mut VOLATILE_FS: MaybeUninit<Filesystem<VolatileStorage>> = MaybeUninit::uninit();
 
     unsafe {
         let ifs_storage = B::ifs_storage().insert(int_flash);
         let ifs_alloc = B::ifs_alloc().insert(Filesystem::allocate());
         let efs_storage = B::efs_storage().insert(ext_flash);
         let efs_alloc = B::efs_alloc().insert(Filesystem::allocate());
-        let vfs_storage = VOLATILE_STORAGE.insert(VolatileStorage::new());
-        let vfs_alloc = VOLATILE_FS_ALLOC.insert(Filesystem::allocate());
+        let vfs_storage = (&mut *addr_of_mut!(VOLATILE_STORAGE)).write(VolatileStorage::new());
+        let vfs_alloc = (&mut *addr_of_mut!(VOLATILE_FS_ALLOC)).write(Filesystem::allocate());
 
         let ifs = match init_ifs::<B>(ifs_storage, ifs_alloc, efs_storage, status) {
             Ok(ifs) => B::ifs().insert(ifs),
@@ -223,7 +224,7 @@ pub fn init_store<B: Board>(
         };
 
         let vfs = match init_vfs(vfs_storage, vfs_alloc) {
-            Ok(vfs) => VOLATILE_FS.insert(vfs),
+            Ok(vfs) => (&mut *addr_of_mut!(VOLATILE_FS)).write(vfs),
             Err(_e) => {
                 error!("VFS Mount Error {:?}", _e);
                 panic!("VFS");

diff --git a/utils/nrf-debugging/walk.py b/utils/nrf-debugging/walk.py
@@ -26,7 +26,7 @@
 read_size = args.read_size
 prog_size = args.prog_size
 
-block_count = img_size / block_size
+block_count = img_size // block_size
 if block_count * block_size != img_size:
     print("image size should be a multiple of block size")
     exit(1)