Move capability_ptr to utilities

Change-Id: If76e4b713fca94fa4f5ba827b994cd8b24624ed5

kernel/src/lib.rs

@@ -105,7 +105,6 @@ pub const KERNEL_MAJOR_VERSION: u16 = 2;
 pub const KERNEL_MINOR_VERSION: u16 = 1;
 
 pub mod capabilities;
-pub mod capability_ptr;
 pub mod collections;
 pub mod component;
 pub mod debug;

kernel/src/process.rs

@@ -11,7 +11,6 @@ use core::ptr::NonNull;
 use core::str;
 
 use crate::capabilities;
-use crate::capability_ptr::CapabilityPtr;
 use crate::errorcode::ErrorCode;
 use crate::ipc;
 use crate::kernel::Kernel;
@@ -20,6 +19,7 @@ use crate::processbuffer::{ReadOnlyProcessBuffer, ReadWriteProcessBuffer};
 use crate::storage_permissions;
 use crate::syscall::{self, Syscall, SyscallReturn};
 use crate::upcall::UpcallId;
+use crate::utilities::capability_ptr::CapabilityPtr;
 use tock_tbf::types::CommandPermissions;
 
 // Export all process related types via `kernel::process::`.

kernel/src/process_standard.rs

@@ -14,8 +14,6 @@ use core::num::NonZeroU32;
 use core::ptr::NonNull;
 use core::{mem, ptr, slice, str};
 
-use crate::capability_ptr::MetaPermissions::Execute;
-use crate::capability_ptr::{CapabilityPtr, MetaPermissions};
 use crate::collections::queue::Queue;
 use crate::collections::ring_buffer::RingBuffer;
 use crate::config;
@@ -38,6 +36,8 @@ use crate::processbuffer::{ReadOnlyProcessBuffer, ReadWriteProcessBuffer};
 use crate::storage_permissions::StoragePermissions;
 use crate::syscall::{self, Syscall, SyscallReturn, UserspaceKernelBoundary};
 use crate::upcall::UpcallId;
+use crate::utilities::capability_ptr::MetaPermissions::Execute;
+use crate::utilities::capability_ptr::{CapabilityPtr, MetaPermissions};
 use crate::utilities::cells::{MapCell, NumericCellExt, OptionalCell};
 
 use tock_tbf::types::CommandPermissions;

kernel/src/syscall.rs

@@ -68,9 +68,9 @@
 
 use core::fmt::Write;
 
-use crate::capability_ptr::{CapabilityPtr, MetaPermissions};
 use crate::errorcode::ErrorCode;
 use crate::process;
+use crate::utilities::capability_ptr::{CapabilityPtr, MetaPermissions};
 
 pub use crate::syscall_driver::{CommandReturn, SyscallDriver};
 

kernel/src/upcall.rs

@@ -4,12 +4,12 @@
 
 //! Data structure for storing an upcall from the kernel to a process.
 
-use crate::capability_ptr::CapabilityPtr;
 use crate::config;
 use crate::debug;
 use crate::process;
 use crate::process::ProcessId;
 use crate::syscall::SyscallReturn;
+use crate::utilities::capability_ptr::CapabilityPtr;
 use crate::ErrorCode;
 
 /// Type to uniquely identify an upcall subscription across all drivers.

kernel/src/utilities/mod.rs

@@ -14,6 +14,7 @@ pub mod peripheral_management;
 pub mod static_init;
 pub mod storage_volume;
 
+pub mod capability_ptr;
 mod static_ref;
 
 pub use self::static_ref::StaticRef;