From 0fe60a00fcd36362afd96da6aa6f4d1e0740d5e1 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 15 Nov 2022 10:58:00 -0700
Subject: [PATCH] ihdad: improve logging

---
 ihdad/src/hda/device.rs | 15 ++++++---------
 ihdad/src/hda/node.rs   |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ihdad/src/hda/device.rs b/ihdad/src/hda/device.rs
index 74cd77d033..fd9630ea85 100755
--- a/ihdad/src/hda/device.rs
+++ b/ihdad/src/hda/device.rs
@@ -205,7 +205,7 @@ impl IntelHDA {
 
 		module.init();
 
-		// module.info();
+		module.info();
 		module.enumerate();
 
 		module.configure();
@@ -372,9 +372,6 @@ impl IntelHDA {
 						} else if config.is_input() {
 							self.input_pins.push(widget.addr);
 						}
-
-						log::info!("{:02X}{:02X} {}", widget.addr().0, widget.addr().1, config);
-
 					},
 					_ => {},
 				}
@@ -471,14 +468,14 @@ impl IntelHDA {
 	pub fn configure(&mut self) {
 		let outpin = self.find_best_output_pin().expect("IHDA: No output pins?!");
 
-		//log::info!("Best pin: {:01X}:{:02X}", outpin.0, outpin.1);
+		log::info!("Best pin: {:01X}:{:02X}", outpin.0, outpin.1);
 
 		let path = self.find_path_to_dac(outpin).unwrap();
 
 		let dac = *path.last().unwrap();
 		let pin = *path.first().unwrap();
 
-		//log::info!("Path to DAC: {:?}", path);
+		log::info!("Path to DAC: {:X?}", path);
 
 		// Pin enable
 		self.cmd.cmd12(pin, 0x707, 0x40);
@@ -490,8 +487,8 @@ impl IntelHDA {
 
 		self.update_sound_buffers();
 
-		//log::info!("Supported Formats: {:08X}", self.get_supported_formats((0,0x1)));
-		//log::info!("Capabilities: {:08X}", self.get_capabilities(path[0]));
+		log::info!("Supported Formats: {:08X}", self.get_supported_formats((0,0x1)));
+		log::info!("Capabilities: {:08X}", self.get_capabilities(path[0]));
 
 		let output = self.get_output_stream_descriptor(0).unwrap();
 
@@ -526,7 +523,7 @@ impl IntelHDA {
 		log::info!("Best pin: {:01X}:{:02X}", outpin.0, outpin.1);
 
 		let path = self.find_path_to_dac(outpin).unwrap();
-		log::info!("Path to DAC: {:?}", path);
+		log::info!("Path to DAC: {:X?}", path);
 
 		// Pin enable
 		self.cmd.cmd12((0,0xC), 0x707, 0x40);
diff --git a/ihdad/src/hda/node.rs b/ihdad/src/hda/node.rs
index 69e6c7e137..b659c3b4ce 100644
--- a/ihdad/src/hda/node.rs
+++ b/ihdad/src/hda/node.rs
@@ -87,7 +87,7 @@ impl fmt::Display for HDANode {
 			match self.widget_type() {
 				HDAWidgetType::PinComplex => write!(
 					f,
-					"Addr: {:02X}:{:02X}, Type: {:?}: {:?}, Inputs: {:X}: {:?}.",
+					"Addr: {:02X}:{:02X}, Type: {:?}: {:?}, Inputs: {:X}: {:X?}.",
 					self.addr.0,
 					self.addr.1,
 					self.widget_type(),
@@ -95,7 +95,7 @@ impl fmt::Display for HDANode {
 					self.conn_list_len,
 					self.connections
 				),
-			  	_ => write!(f, "Addr: {:02X}:{:02X}, Type: {:?}, Inputs: {:X}: {:?}.", self.addr.0, self.addr.1, self.widget_type(), self.conn_list_len, self.connections),
+			  	_ => write!(f, "Addr: {:02X}:{:02X}, Type: {:?}, Inputs: {:X}: {:X?}.", self.addr.0, self.addr.1, self.widget_type(), self.conn_list_len, self.connections),
 			}
 		} else {
 			write!(f, "Addr: {:02X}:{:02X}, AFG: {}, Widget count {}.", self.addr.0, self.addr.1, self.function_group_type, self.subnode_count)