Merge pull request #21 from mripard/fixes

Various Fixes

Author: mripard

Cargo.toml

@@ -13,7 +13,6 @@ repository = "https://github.com/mripard/dma-heap/"
 [dependencies]
 log = "0.4.27"
 rustix = { version = "1.0.7", features = ["fs"] }
-strum_macros = "0.27.1"
 
 [features]
 nightly = []

src/ioctl.rs

@@ -37,14 +37,9 @@ fn dma_heap_alloc_ioctl(fd: BorrowedFd<'_>, data: &mut dma_heap_allocation_data)
 }
 
 pub(crate) fn dma_heap_alloc(fd: BorrowedFd<'_>, len: usize) -> io::Result<OwnedFd> {
-    let mut fd_flags = OFlags::empty();
-
-    fd_flags.insert(OFlags::CLOEXEC);
-    fd_flags.insert(OFlags::RDWR);
-
     let mut data = dma_heap_allocation_data {
         len: len as u64,
-        fd_flags: fd_flags.bits(),
+        fd_flags: OFlags::union(OFlags::CLOEXEC, OFlags::RDWR).bits(),
         ..dma_heap_allocation_data::default()
     };
 

src/lib.rs

@@ -18,6 +18,7 @@
 #![doc = include_str!("../README.md")]
 #![allow(unsafe_code)]
 
+use core::fmt;
 use std::{
     fs::File,
     io,
@@ -28,10 +29,9 @@ use std::{
 mod ioctl;
 use ioctl::dma_heap_alloc;
 use log::debug;
-use strum_macros::Display;
 
 /// Various Types of DMA-Buf Heap
-#[derive(Clone, Debug, Display)]
+#[derive(Clone, Debug)]
 pub enum HeapKind {
     /// A Heap backed by the Contiguous Memory Allocator in the Linux kernel, returning physically
     /// contiguous, cached, buffers
@@ -45,6 +45,16 @@ pub enum HeapKind {
     Custom(PathBuf),
 }
 
+impl fmt::Display for HeapKind {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            HeapKind::Cma => f.write_str("CMA"),
+            HeapKind::System => f.write_str("System"),
+            HeapKind::Custom(p) => f.write_fmt(format_args!("Custom Heap ({})", p.display())),
+        }
+    }
+}
+
 /// Our DMA-Buf Heap
 #[derive(Debug)]
 pub struct Heap {