Messages in this thread Patch in this message | | | From | Asahi Lina <> | Date | Wed, 29 Mar 2023 20:40:19 +0900 | Subject | [PATCH 2/2] rust: ioctl: Move to the uapi crate |
| |
Now that we have the uapi crate, this abstraction can use that instead of bindings.
Signed-off-by: Asahi Lina <lina@asahilina.net> --- rust/kernel/ioctl.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/rust/kernel/ioctl.rs b/rust/kernel/ioctl.rs index b2076113b6a8..007437959395 100644 --- a/rust/kernel/ioctl.rs +++ b/rust/kernel/ioctl.rs @@ -10,40 +10,40 @@ use crate::build_assert; /// Build an ioctl number, analogous to the C macro of the same name. #[inline(always)] const fn _IOC(dir: u32, ty: u32, nr: u32, size: usize) -> u32 { - build_assert!(dir <= bindings::_IOC_DIRMASK); - build_assert!(ty <= bindings::_IOC_TYPEMASK); - build_assert!(nr <= bindings::_IOC_NRMASK); - build_assert!(size <= (bindings::_IOC_SIZEMASK as usize)); + build_assert!(dir <= uapi::_IOC_DIRMASK); + build_assert!(ty <= uapi::_IOC_TYPEMASK); + build_assert!(nr <= uapi::_IOC_NRMASK); + build_assert!(size <= (uapi::_IOC_SIZEMASK as usize)); - (dir << bindings::_IOC_DIRSHIFT) - | (ty << bindings::_IOC_TYPESHIFT) - | (nr << bindings::_IOC_NRSHIFT) - | ((size as u32) << bindings::_IOC_SIZESHIFT) + (dir << uapi::_IOC_DIRSHIFT) + | (ty << uapi::_IOC_TYPESHIFT) + | (nr << uapi::_IOC_NRSHIFT) + | ((size as u32) << uapi::_IOC_SIZESHIFT) } /// Build an ioctl number for an argumentless ioctl. #[inline(always)] pub const fn _IO(ty: u32, nr: u32) -> u32 { - _IOC(bindings::_IOC_NONE, ty, nr, 0) + _IOC(uapi::_IOC_NONE, ty, nr, 0) } /// Build an ioctl number for an read-only ioctl. #[inline(always)] pub const fn _IOR<T>(ty: u32, nr: u32) -> u32 { - _IOC(bindings::_IOC_READ, ty, nr, core::mem::size_of::<T>()) + _IOC(uapi::_IOC_READ, ty, nr, core::mem::size_of::<T>()) } /// Build an ioctl number for an write-only ioctl. #[inline(always)] pub const fn _IOW<T>(ty: u32, nr: u32) -> u32 { - _IOC(bindings::_IOC_WRITE, ty, nr, core::mem::size_of::<T>()) + _IOC(uapi::_IOC_WRITE, ty, nr, core::mem::size_of::<T>()) } /// Build an ioctl number for a read-write ioctl. #[inline(always)] pub const fn _IOWR<T>(ty: u32, nr: u32) -> u32 { _IOC( - bindings::_IOC_READ | bindings::_IOC_WRITE, + uapi::_IOC_READ | uapi::_IOC_WRITE, ty, nr, core::mem::size_of::<T>(), @@ -52,20 +52,20 @@ pub const fn _IOWR<T>(ty: u32, nr: u32) -> u32 { /// Get the ioctl direction from an ioctl number. pub const fn _IOC_DIR(nr: u32) -> u32 { - (nr >> bindings::_IOC_DIRSHIFT) & bindings::_IOC_DIRMASK + (nr >> uapi::_IOC_DIRSHIFT) & uapi::_IOC_DIRMASK } /// Get the ioctl type from an ioctl number. pub const fn _IOC_TYPE(nr: u32) -> u32 { - (nr >> bindings::_IOC_TYPESHIFT) & bindings::_IOC_TYPEMASK + (nr >> uapi::_IOC_TYPESHIFT) & uapi::_IOC_TYPEMASK } /// Get the ioctl number from an ioctl number. pub const fn _IOC_NR(nr: u32) -> u32 { - (nr >> bindings::_IOC_NRSHIFT) & bindings::_IOC_NRMASK + (nr >> uapi::_IOC_NRSHIFT) & uapi::_IOC_NRMASK } /// Get the ioctl size from an ioctl number. pub const fn _IOC_SIZE(nr: u32) -> usize { - ((nr >> bindings::_IOC_SIZESHIFT) & bindings::_IOC_SIZEMASK) as usize + ((nr >> uapi::_IOC_SIZESHIFT) & uapi::_IOC_SIZEMASK) as usize } -- 2.40.0
| |