Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ability to get more storage information. #637

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Add ability to get more storage information. #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/env/tock/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions third_party/libtock-drivers/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down