Adds vop_read_args

Author: ultimaweapon

kernel-1100/src/lib.rs

@@ -9,7 +9,7 @@ use self::socket::Socket;
 use self::thread::Thread;
 use self::ucred::Ucred;
 use self::uio::Uio;
-use self::vnode::{Vnode, VnodeOp, VopUnlock, VopVector};
+use self::vnode::{Vnode, VnodeOp, VopRead, VopUnlock, VopVector};
 use core::ffi::{c_char, c_int};
 use core::num::NonZero;
 use okf::fd::OpenFlags;
@@ -71,6 +71,7 @@ impl okf::Kernel for Kernel {
     type Uio = Uio;
     type Vnode = Vnode;
     type VnodeOp = VnodeOp;
+    type VopRead = VopRead;
     type VopUnlock = VopUnlock;
     type VopVector = VopVector;
 

kernel-1100/src/vnode.rs

@@ -1,3 +1,5 @@
+use crate::ucred::Ucred;
+use crate::uio::Uio;
 use crate::Kernel;
 use core::ffi::c_int;
 
@@ -35,3 +37,33 @@ pub struct VopUnlock {
 }
 
 impl okf::vnode::VopUnlock for VopUnlock {}
+
+/// Implementation of [`okf::vnode::VopRead`] for 11.00.
+#[repr(C)]
+pub struct VopRead {
+    desc: *mut VnodeOp,
+    vp: *mut Vnode,
+    uio: *mut Uio,
+    flags: c_int,
+    cred: *mut Ucred,
+}
+
+impl okf::vnode::VopRead<Kernel> for VopRead {
+    unsafe fn new(
+        k: Kernel,
+        vp: *mut Vnode,
+        uio: *mut Uio,
+        flags: c_int,
+        cred: *mut Ucred,
+    ) -> Self {
+        use okf::Kernel;
+
+        Self {
+            desc: k.var(crate::Kernel::VOP_READ).ptr(),
+            vp,
+            uio,
+            flags,
+            cred,
+        }
+    }
+}

src/lib.rs

@@ -11,7 +11,7 @@ use self::socket::{SockAddr, Socket};
 use self::thread::Thread;
 use self::ucred::Ucred;
 use self::uio::{Uio, UioSeg};
-use self::vnode::{Vnode, VnodeOp, VopUnlock, VopVector};
+use self::vnode::{Vnode, VnodeOp, VopRead, VopUnlock, VopVector};
 use core::alloc::{GlobalAlloc, Layout};
 use core::ffi::{c_char, c_int};
 use core::marker::PhantomData;
@@ -77,6 +77,7 @@ pub trait Kernel: MappedKernel {
     type Uio: Uio<Self>;
     type Vnode: Vnode<Self>;
     type VnodeOp: VnodeOp;
+    type VopRead: VopRead<Self>;
     type VopUnlock: VopUnlock;
     type VopVector: VopVector;
 

src/vnode/op.rs

@@ -1,5 +1,23 @@
+use crate::Kernel;
+use core::ffi::c_int;
+
 /// Represents `vnodeop_desc` structure.
 pub trait VnodeOp: Sized {}
 
 /// Represents `vop_unlock_args` structure.
 pub trait VopUnlock: Sized {}
+
+/// Represents `vop_read_args` structure.
+pub trait VopRead<K: Kernel>: Sized {
+    /// # Safety
+    /// - `vp` cannot be null and must be locked.
+    /// - `uio` cannot be null.
+    /// - `cred` cannot be null.
+    unsafe fn new(
+        k: K,
+        vp: *mut K::Vnode,
+        uio: *mut K::Uio,
+        flags: c_int,
+        cred: *mut K::Ucred,
+    ) -> Self;
+}