Merge branch 'develop' into remove_alarm

google · Jul 11, 2023 · fc3d056 · fc3d056
2 parents 2199f2f + a274a51
commit fc3d056
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/env/tock/storage.rs b/src/env/tock/storage.rs
@@ -87,8 +87,8 @@ impl<S: Syscalls, C: platform::subscribe::Config + platform::allow_ro::Config> T
             if !matches!(storage_type, StorageType::Store) {
                 continue;
             }
-            let storage_ptr = to_storage_result(LibtockStorage::<S, C>::storage_ptr())?;
-            let storage_len = to_storage_result(LibtockStorage::<S, C>::storage_len())?;
+            let storage_ptr = to_storage_result(LibtockStorage::<S, C>::storage_ptr(i))?;
+            let storage_len = to_storage_result(LibtockStorage::<S, C>::storage_len(i))?;
             if !syscall.is_page_aligned(storage_ptr) || !syscall.is_page_aligned(storage_len) {
                 return Err(StorageError::CustomError);
             }
@@ -210,8 +210,8 @@ where
             if !matches!(storage_type, StorageType::Partition) {
                 continue;
             };
-            let storage_ptr = to_storage_result(LibtockStorage::<S, C>::storage_ptr())?;
-            let storage_len = to_storage_result(LibtockStorage::<S, C>::storage_len())?;
+            let storage_ptr = to_storage_result(LibtockStorage::<S, C>::storage_ptr(i))?;
+            let storage_len = to_storage_result(LibtockStorage::<S, C>::storage_len(i))?;
             if !locations.is_page_aligned(storage_ptr) || !locations.is_page_aligned(storage_len) {
                 return Err(StorageError::CustomError);
             }

diff --git a/third_party/libtock-drivers/src/storage.rs b/third_party/libtock-drivers/src/storage.rs
@@ -147,12 +147,12 @@ impl<S: Syscalls, C: platform::subscribe::Config + platform::allow_ro::Config> S
         Ok(Self::memop(memop_nr::STORAGE_CNT, 0)? as usize)
     }
 
-    pub fn storage_ptr() -> TockResult<usize> {
-        Ok(Self::memop(memop_nr::STORAGE_PTR, 0)? as usize)
+    pub fn storage_ptr(index: usize) -> TockResult<usize> {
+        Ok(Self::memop(memop_nr::STORAGE_PTR, index as u32)? as usize)
     }
 
-    pub fn storage_len() -> TockResult<usize> {
-        Ok(Self::memop(memop_nr::STORAGE_LEN, 0)? as usize)
+    pub fn storage_len(index: usize) -> TockResult<usize> {
+        Ok(Self::memop(memop_nr::STORAGE_LEN, index as u32)? as usize)
     }
 
     pub fn storage_type(index: usize) -> TockResult<StorageType> {