Moved types.rs to c_types.rs so types can be used for higher level abstractions

Author: alex

build.rs

@@ -29,7 +29,7 @@ const INCLUDED_VARS: &[&str] = &[
 fn main() {
     let mut builder = bindgen::Builder::default()
         .use_core()
-        .ctypes_prefix("types")
+        .ctypes_prefix("c_types")
         .no_copy(".*")
         .derive_default(true)
         .rustfmt_bindings(true);

src/allocator.rs

@@ -1,7 +1,7 @@
 use alloc::heap::{AllocErr, GlobalAlloc, Layout, Opaque};
 
 use bindings;
-use types;
+use c_types;
 
 pub struct KernelAllocator;
 
@@ -10,14 +10,14 @@ unsafe impl GlobalAlloc for KernelAllocator {
         // krealloc is used instead of kmalloc because kmalloc is an inline function and can't be
         // bound to as a result
         return bindings::krealloc(
-            0 as *const types::c_void,
+            0 as *const c_types::c_void,
             layout.size(),
             bindings::GFP_KERNEL,
         ) as *mut Opaque;
     }
 
     unsafe fn dealloc(&self, ptr: *mut Opaque, _layout: Layout) {
-        bindings::kfree(ptr as *const types::c_void);
+        bindings::kfree(ptr as *const c_types::c_void);
     }
 }
 

src/bindings.rs

@@ -1,6 +1,6 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case, improper_ctypes)]
 
-use types;
+use c_types;
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 

src/types.rs renamed to src/c_types.rs

@@ -1,16 +1,16 @@
 use bindings;
-use types;
+use c_types;
 
-pub struct Error(types::c_int);
+pub struct Error(c_types::c_int);
 
 impl Error {
     pub const EINVAL: Self = Error(-(bindings::EINVAL as i32));
 
-    pub fn from_kernel_errno(errno: types::c_int) -> Error {
+    pub fn from_kernel_errno(errno: c_types::c_int) -> Error {
         return Error(errno);
     }
 
-    pub fn to_kernel_errno(&self) -> types::c_int {
+    pub fn to_kernel_errno(&self) -> c_types::c_int {
         return self.0;
     }
 }

src/error.rs

@@ -5,7 +5,7 @@ use core::mem;
 
 use bindings;
 use error;
-use types;
+use c_types;
 
 pub struct FileSystemRegistration<T: FileSystem> {
     _phantom: marker::PhantomData<T>,
@@ -25,12 +25,12 @@ pub trait FileSystem {
 }
 
 bitflags! {
-    pub struct FileSystemFlags: types::c_int {
-        const FS_REQUIRES_DEV = bindings::FS_REQUIRES_DEV as types::c_int;
-        const FS_BINARY_MOUNTDATA = bindings::FS_BINARY_MOUNTDATA as types::c_int;
-        const FS_HAS_SUBTYPE = bindings::FS_HAS_SUBTYPE as types::c_int;
-        const FS_USERNS_MOUNT = bindings::FS_USERNS_MOUNT as types::c_int;
-        const FS_RENAME_DOES_D_MOVE = bindings::FS_RENAME_DOES_D_MOVE as types::c_int;
+    pub struct FileSystemFlags: c_types::c_int {
+        const FS_REQUIRES_DEV = bindings::FS_REQUIRES_DEV as c_types::c_int;
+        const FS_BINARY_MOUNTDATA = bindings::FS_BINARY_MOUNTDATA as c_types::c_int;
+        const FS_HAS_SUBTYPE = bindings::FS_HAS_SUBTYPE as c_types::c_int;
+        const FS_USERNS_MOUNT = bindings::FS_USERNS_MOUNT as c_types::c_int;
+        const FS_RENAME_DOES_D_MOVE = bindings::FS_RENAME_DOES_D_MOVE as c_types::c_int;
     }
 }
 
@@ -42,9 +42,9 @@ impl FileSystemFlags {
 
 extern "C" fn fill_super_callback<T: FileSystem>(
     _sb: *mut bindings::super_block,
-    _data: *mut types::c_void,
-    _silent: types::c_int,
-) -> types::c_int {
+    _data: *mut c_types::c_void,
+    _silent: c_types::c_int,
+) -> c_types::c_int {
     // T::fill_super(...)
     // This should actually create an object that gets dropped by
     // file_system_registration::kill_sb. You can point to it with
@@ -54,9 +54,9 @@ extern "C" fn fill_super_callback<T: FileSystem>(
 
 extern "C" fn mount_callback<T: FileSystem>(
     fs_type: *mut bindings::file_system_type,
-    flags: types::c_int,
-    _dev_name: *const types::c_char,
-    data: *mut types::c_void,
+    flags: c_types::c_int,
+    _dev_name: *const c_types::c_char,
+    data: *mut c_types::c_void,
 ) -> *mut bindings::dentry {
     unsafe { bindings::mount_nodev(fs_type, flags, data, Some(fill_super_callback::<T>)) }
 }

src/filesystem.rs

@@ -10,18 +10,20 @@ pub mod bindings;
 mod error;
 pub mod filesystem;
 pub mod printk;
-pub mod types;
+mod c_types;
 
 pub use alloc::format;
 
 pub use error::{Error, KernelResult};
 
+pub type _InitResult = c_types::c_int;
+
 #[macro_export]
 macro_rules! kernel_module {
     ($module:ty, $($name:ident : $value:expr),*) => {
         static mut __MOD: Option<$module> = None;
         #[no_mangle]
-        pub extern "C" fn init_module() -> $crate::types::c_int {
+        pub extern "C" fn init_module() -> $crate::_InitResult {
             match <$module as $crate::KernelModule>::init() {
                 Ok(m) => {
                     unsafe {

src/lib.rs

@@ -1,7 +1,7 @@
 use core::cmp;
 use core::fmt;
 
-use types::c_int;
+use c_types::c_int;
 
 pub struct KernelConsole;