Add debug macro in structs and enums

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Author: patrickelectric

Cargo.toml

@@ -11,6 +11,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
+derivative = "1.0.3"
 libc = "0.2"
 thiserror = "1.0.9"
 

src/lib.rs

@@ -45,6 +45,9 @@ mod v4l2;
 
 pub type Result<T> = result::Result<T, Error>;
 
+#[macro_use]
+extern crate derivative;
+
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("I/O error: {0}")]
@@ -59,6 +62,7 @@ pub enum Error {
     BadField,
 }
 
+#[derive(Debug)]
 pub struct Config<'a> {
     /// The mix of numerator and denominator. v4l2 uses frame intervals instead of frame rates.
     /// Default is `(1, 10)`.
@@ -201,6 +205,7 @@ impl fmt::Debug for IntervalInfo {
     }
 }
 
+#[derive(Debug)]
 pub struct Frame {
     /// Width and height of the frame.
     pub resolution: (u32, u32),
@@ -243,6 +248,7 @@ enum State {
     Aborted,
 }
 
+#[derive(Debug)]
 pub struct Camera {
     fd: RawFd,
     state: State,
@@ -654,6 +660,7 @@ impl Drop for Camera {
     }
 }
 
+#[derive(Debug)]
 pub struct FormatIter<'a> {
     camera: &'a Camera,
     index: u32,
@@ -681,6 +688,7 @@ impl<'a> Iterator for FormatIter<'a> {
     }
 }
 
+#[derive(Debug)]
 pub struct ControlIter<'a> {
     camera: &'a Camera,
     id: u32,

src/v4l2.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::unreadable_literal)]
 
 use std::ffi::CString;
+use std::fmt;
 use std::os::unix::io::RawFd;
 use std::ptr::null_mut;
 use std::{io, mem, usize};
@@ -94,6 +95,7 @@ pub fn xioctl_valid<T>(fd: RawFd, request: usize, arg: &mut T) -> io::Result<boo
     }
 }
 
+#[derive(Debug)]
 pub struct MappedRegion {
     pub ptr: *mut u8,
     pub len: usize,
@@ -130,12 +132,15 @@ pub fn mmap(length: usize, fd: RawFd, offset: usize) -> io::Result<MappedRegion>
     })
 }
 
+#[derive(Derivative)]
+#[derivative(Debug)]
 #[repr(C)]
 pub struct Format {
     pub ftype: u32,
     #[cfg(target_pointer_width = "64")]
     padding: u32,
     pub fmt: PixFormat,
+    #[derivative(Debug="ignore")]
     space: [u8; 156],
 }
 
@@ -160,6 +165,7 @@ impl Format {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct PixFormat {
     pub width: u32,
@@ -186,6 +192,7 @@ impl PixFormat {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct RequestBuffers {
     pub count: u32,
@@ -205,13 +212,16 @@ impl RequestBuffers {
     }
 }
 
+#[derive(Derivative)]
+#[derivative(Debug)]
 #[repr(C)]
 pub struct Buffer {
     pub index: u32,
     pub btype: u32,
     pub bytesused: u32,
     pub flags: u32,
     pub field: u32,
+    #[derivative(Debug="ignore")]
     pub timestamp: Timeval,
     pub timecode: TimeCode,
     pub sequence: u32,
@@ -231,6 +241,7 @@ impl Buffer {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct TimeCode {
     pub ttype: u32,
@@ -242,6 +253,7 @@ pub struct TimeCode {
     pub userbits: [u8; 4],
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct FmtDesc {
     pub index: u32,
@@ -260,10 +272,13 @@ impl FmtDesc {
     }
 }
 
+#[derive(Derivative)]
+#[derivative(Debug)]
 #[repr(C)]
 pub struct StreamParm {
     pub ptype: u32,
     pub parm: CaptureParm,
+    #[derivative(Debug="ignore")]
     space: [u8; 160],
 }
 
@@ -277,6 +292,7 @@ impl StreamParm {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct CaptureParm {
     pub capability: u32,
@@ -287,12 +303,14 @@ pub struct CaptureParm {
     reserved: [u32; 4],
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct Fract {
     pub numerator: u32,
     pub denominator: u32,
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct Frmsizeenum {
     pub index: u32,
@@ -318,12 +336,14 @@ impl Frmsizeenum {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct FrmsizeDiscrete {
     pub width: u32,
     pub height: u32,
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct FrmsizeStepwise {
     pub min_width: u32,
@@ -334,6 +354,7 @@ pub struct FrmsizeStepwise {
     pub step_height: u32,
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct Frmivalenum {
     pub index: u32,
@@ -363,13 +384,15 @@ impl Frmivalenum {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct FrmivalStepwise {
     pub min: Fract,
     pub max: Fract,
     pub step: Fract,
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct QueryCtrl {
     pub id: u32,
@@ -391,6 +414,7 @@ impl QueryCtrl {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct QueryExtCtrl {
     pub id: u32,
@@ -418,6 +442,7 @@ impl QueryExtCtrl {
     }
 }
 
+#[derive(Debug, Copy, Clone)]
 #[repr(C, packed)]
 pub struct QueryMenu {
     pub id: u32,
@@ -426,12 +451,19 @@ pub struct QueryMenu {
     reserved: u32,
 }
 
+#[derive(Copy, Clone)]
 #[repr(C, packed)]
 pub union QueryMenuData {
     name: [u8; 32],
     value: i64,
 }
 
+impl fmt::Debug for QueryMenuData {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self.name())
+    }
+}
+
 impl QueryMenu {
     pub fn new(id: u32) -> QueryMenu {
         let mut menu: QueryMenu = unsafe { mem::zeroed() };
@@ -450,6 +482,7 @@ impl QueryMenuData {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct Control {
     pub id: u32,
@@ -462,6 +495,7 @@ impl Control {
     }
 }
 
+#[derive(Debug, Copy, Clone)]
 #[repr(C, packed)]
 pub struct ExtControl {
     pub id: u32,
@@ -481,6 +515,7 @@ impl ExtControl {
     }
 }
 
+#[derive(Debug)]
 #[repr(C)]
 pub struct ExtControls<'a> {
     pub ctrl_class: u32,