Improve logging

Author: suchmememanyskill

dsp-to-serial/compile.sh

@@ -1,18 +1,28 @@
-use std::{ffi::c_void, time::Duration};
+use std::{ffi::c_void, fmt::Debug, time::Duration};
 
 use nix::libc::{msync, MS_INVALIDATE};
 
 use crate::{kbuf::UserWrapperBufData, msgbox::MsgboxEndpoint, sharespace::Sharespace};
 
 
 #[repr(C)]
-#[derive(Default, Debug)]
+#[derive(Default)]
 pub struct MsgHead {
     pub read_addr: u32,
     pub write_addr: u32,
     pub init_state: u32,
 }
 
+impl Debug for MsgHead {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "MsgHead {{ read_addr: 0x{:x}, write_addr: 0x{:x}, init_state: 0x{:x} }}",
+            self.read_addr, self.write_addr, self.init_state
+        )
+    }
+}
+
 impl MsgHead {
     fn from_bytes(bytes: &[u8; 12]) -> Self {
         let read_addr = u32::from_le_bytes(bytes[0..4].try_into().unwrap());
@@ -83,7 +93,9 @@ impl CommunicationHandler {
         head.write_addr = self.user_buf.buf.pa;
 
         self.sharespace.write_buffer.as_mut()[SHARE_SPACE_HEAD_OFFSET..]
-            .copy_from_slice(&head.to_bytes())
+            .copy_from_slice(&head.to_bytes());
+
+        println!("Wrote ARM head to sharespace mmap at offset 0x{:x}: {:?}", SHARE_SPACE_HEAD_OFFSET, head);
     }
 
     // pVirArmBuf

dsp-to-serial/src/communication_handler.rs

@@ -58,10 +58,10 @@ pub fn kbuf_use_new_buf(arm_write_addr: u32) -> Result<UserWrapperBufData, Appli
     let mgr_fd = open("/dev/kbuf-mgr-0", OFlag::O_RDWR, Mode::empty())?;
     let mgr_fd_raw = mgr_fd.as_raw_fd();
 
-    println!("{:#?}", &buf_data);
-
     unsafe { wrap_ioctl_negative_invalid(kbuf_mgr_dev_create_buf(mgr_fd_raw, &mut buf_data))? };
 
+    println!("Created kbuf at physical address 0x{:x}", buf_data.pa);
+
     let map_dev_path = format!("/dev/kbuf-map-{}-{}", buf_data.minor, u8_slice_to_string(&buf_data.name));
 
     println!("Mapping kbuf device at path: {}", map_dev_path);

dsp-to-serial/src/kbuf.rs

@@ -33,6 +33,7 @@ pub struct DspSharespace {
     pub debug_msg: DebugMessage,
 }
 
+#[derive(Debug)]
 enum ChooseShareSpace {
     ChooseDspWriteSpace = 0,
     ChooseArmWriteSpace = 1,
@@ -49,13 +50,13 @@ fn choose_sharespace(
     let raw_fd = fd.as_raw_fd();
     wrap_ioctl_negative_invalid(unsafe { read_debug_message(raw_fd, msg) })?;
 
-    println!("Before choose: {:#?}", msg);
-
     msg.mmap_phy_addr = match choose {
         ChooseShareSpace::ChooseDspWriteSpace => msg.dsp_write_addr,
         ChooseShareSpace::ChooseArmWriteSpace => msg.arm_write_addr,
     };
 
+    println!("Init sharespace {:?} to 0x{:x}", choose, msg.mmap_phy_addr);
+
     wrap_ioctl_negative_invalid(unsafe { write_debug_message(raw_fd, msg) })?;
 
     Ok(())