diff --git a/boards/components/src/storage_permissions/individual.rs b/boards/components/src/storage_permissions/individual.rs index 58130ad1e8..fb484e9497 100644 --- a/boards/components/src/storage_permissions/individual.rs +++ b/boards/components/src/storage_permissions/individual.rs @@ -14,6 +14,7 @@ //! ``` use core::mem::MaybeUninit; +use kernel::capabilities; use kernel::component::Component; use kernel::platform::chip::Chip; @@ -21,13 +22,22 @@ use kernel::platform::chip::Chip; macro_rules! storage_permissions_individual_component_static { ($C:ty $(,)?) => {{ kernel::static_buf!( - capsules_system::storage_permissions::individual::IndividualStoragePermissions<$C> + capsules_system::storage_permissions::individual::IndividualStoragePermissions< + $C, + components::storage_permissions::individual::AppStoreCapability + > ) };}; } +pub struct AppStoreCapability; +unsafe impl capabilities::ApplicationStorageCapability for AppStoreCapability {} + pub type StoragePermissionsIndividualComponentType = - capsules_system::storage_permissions::individual::IndividualStoragePermissions; + capsules_system::storage_permissions::individual::IndividualStoragePermissions< + C, + AppStoreCapability, + >; pub struct StoragePermissionsIndividualComponent { _chip: core::marker::PhantomData, @@ -43,14 +53,22 @@ impl StoragePermissionsIndividualComponent { impl Component for StoragePermissionsIndividualComponent { type StaticInput = &'static mut MaybeUninit< - capsules_system::storage_permissions::individual::IndividualStoragePermissions, + capsules_system::storage_permissions::individual::IndividualStoragePermissions< + C, + AppStoreCapability, + >, >; type Output = - &'static capsules_system::storage_permissions::individual::IndividualStoragePermissions; + &'static capsules_system::storage_permissions::individual::IndividualStoragePermissions< + C, + AppStoreCapability, + >; fn finalize(self, s: Self::StaticInput) -> Self::Output { s.write( - capsules_system::storage_permissions::individual::IndividualStoragePermissions::new(), + capsules_system::storage_permissions::individual::IndividualStoragePermissions::new( + AppStoreCapability, + ), ) } } diff --git a/boards/components/src/storage_permissions/tbf_header.rs b/boards/components/src/storage_permissions/tbf_header.rs index 68ddf2eae7..0252c74f17 100644 --- a/boards/components/src/storage_permissions/tbf_header.rs +++ b/boards/components/src/storage_permissions/tbf_header.rs @@ -13,13 +13,22 @@ use kernel::platform::chip::Chip; macro_rules! storage_permissions_tbf_header_component_static { ($C:ty $(,)?) => {{ kernel::static_buf!( - capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions<$C> + capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions< + $C, + components::storage_permissions::tbf_header::AppStoreCapability + > ) };}; } +pub struct AppStoreCapability; +unsafe impl kernel::capabilities::ApplicationStorageCapability for AppStoreCapability {} + pub type StoragePermissionsTbfHeaderComponentType = - capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions; + capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions< + C, + AppStoreCapability, + >; pub struct StoragePermissionsTbfHeaderComponent { _chip: core::marker::PhantomData, @@ -35,14 +44,22 @@ impl StoragePermissionsTbfHeaderComponent { impl Component for StoragePermissionsTbfHeaderComponent { type StaticInput = &'static mut MaybeUninit< - capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions, + capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions< + C, + AppStoreCapability, + >, >; type Output = - &'static capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions; + &'static capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions< + C, + AppStoreCapability, + >; fn finalize(self, s: Self::StaticInput) -> Self::Output { s.write( - capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions::new(), + capsules_system::storage_permissions::tbf_header::TbfHeaderStoragePermissions::new( + AppStoreCapability, + ), ) } }