diff --git a/acpid/src/aml_physmem.rs b/acpid/src/aml_physmem.rs
index f7b969b88481fecdad7f412062e9630091c36bbd..8f38ef6dcd174ca58fa46ef1aca85da07dce5d6b 100644
--- a/acpid/src/aml_physmem.rs
+++ b/acpid/src/aml_physmem.rs
@@ -247,7 +247,14 @@ impl aml::Handler for AmlPhysMemHandler {
}
fn read_pci_u8(&self, _segment: u16, _bus: u8, _device: u8, _function: u8, _offset: u16) -> u8 {
- log::error!("read pci u8 {:X}, {:X}, {:X}, {:X}, {:X}", _segment, _bus, _device, _function, _offset);
+ log::error!(
+ "read pci u8 {:X}, {:X}, {:X}, {:X}, {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset
+ );
0
}
@@ -259,7 +266,14 @@ impl aml::Handler for AmlPhysMemHandler {
_function: u8,
_offset: u16,
) -> u16 {
- log::error!("read pci u16 {:X}, {:X}, {:X}, {:X}, {:X}", _segment, _bus, _device, _function, _offset);
+ log::error!(
+ "read pci u16 {:X}, {:X}, {:X}, {:X}, {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset
+ );
0
}
@@ -271,7 +285,14 @@ impl aml::Handler for AmlPhysMemHandler {
_function: u8,
_offset: u16,
) -> u32 {
- log::error!("read pci u32 {:X}, {:X}, {:X}, {:X}, {:X}", _segment, _bus, _device, _function, _offset);
+ log::error!(
+ "read pci u32 {:X}, {:X}, {:X}, {:X}, {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset
+ );
0
}
@@ -284,7 +305,15 @@ impl aml::Handler for AmlPhysMemHandler {
_offset: u16,
_value: u8,
) {
- log::error!("write pci u8 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}", _segment, _bus, _device, _function, _offset, _value);
+ log::error!(
+ "write pci u8 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset,
+ _value
+ );
}
fn write_pci_u16(
&self,
@@ -295,7 +324,15 @@ impl aml::Handler for AmlPhysMemHandler {
_offset: u16,
_value: u16,
) {
- log::error!("write pci u16 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}", _segment, _bus, _device, _function, _offset, _value);
+ log::error!(
+ "write pci u16 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset,
+ _value
+ );
}
fn write_pci_u32(
&self,
@@ -306,7 +343,15 @@ impl aml::Handler for AmlPhysMemHandler {
_offset: u16,
_value: u32,
) {
- log::error!("write pci u32 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}", _segment, _bus, _device, _function, _offset, _value);
+ log::error!(
+ "write pci u32 {:X}, {:X}, {:X}, {:X}, {:X} = {:X}",
+ _segment,
+ _bus,
+ _device,
+ _function,
+ _offset,
+ _value
+ );
}
}
diff --git a/amlserde/src/lib.rs b/amlserde/src/lib.rs
index 1336f5778d64f3d4388ac3494796a0f227ab4856..a7ea76b9deccc527ae646f3f1e28eba90635252b 100644
--- a/amlserde/src/lib.rs
+++ b/amlserde/src/lib.rs
@@ -211,7 +211,9 @@ impl AmlSerdeValue {
serialize: flags.serialize(),
sync_level: flags.sync_level(),
},
- AmlValue::Buffer(buffer_data) => AmlSerdeValue::Buffer({ buffer_data.lock().to_owned() }),
+ AmlValue::Buffer(buffer_data) => {
+ AmlSerdeValue::Buffer({ buffer_data.lock().to_owned() })
+ }
AmlValue::BufferField {
buffer_data,
offset,
@@ -219,7 +221,7 @@ impl AmlSerdeValue {
} => AmlSerdeValue::BufferField {
offset: offset.to_owned(),
length: length.to_owned(),
- data: { buffer_data.lock().to_owned() }
+ data: { buffer_data.lock().to_owned() },
},
AmlValue::Processor {
id,
diff --git a/hwd/src/main.rs b/hwd/src/main.rs
index 7b50c43153f9769f906775e4de1d7e83d837b018..45710fb8ccdd6d8bac43efe0df9e5e83944adc6e 100644
--- a/hwd/src/main.rs
+++ b/hwd/src/main.rs
@@ -18,9 +18,7 @@ fn acpi() -> Result<(), Box<dyn Error>> {
let vendor_3 = (((vendor_rev >> 0) & 0x1f) as u8 + 64) as char;
format!("{}{}{}{:04X}", vendor_1, vendor_2, vendor_3, device)
}
- AmlSerdeValue::String(string) => {
- string
- },
+ AmlSerdeValue::String(string) => string,
_ => {
log::warn!("{}: unsupported value {:x?}", name, value);
continue;
diff --git a/xhcid/src/xhci/mod.rs b/xhcid/src/xhci/mod.rs
index 1c32b122c0d3fe8329e7319e51cbf1610f0bc3c7..6ba32fc6ea78e3fef93aeb1df21ea5fe6939f962 100644
--- a/xhcid/src/xhci/mod.rs
+++ b/xhcid/src/xhci/mod.rs
@@ -847,36 +847,69 @@ impl Xhci {
pub async fn detach_device(&self, port_number: usize) -> Result<()> {
if let Some(children) = self.drivers.remove(&port_number) {
for mut child in children {
- info!("killing driver process {} for port {}", child.id(), port_number);
+ info!(
+ "killing driver process {} for port {}",
+ child.id(),
+ port_number
+ );
match child.kill() {
Ok(()) => {
- info!("killed driver process {} for port {}", child.id(), port_number);
+ info!(
+ "killed driver process {} for port {}",
+ child.id(),
+ port_number
+ );
match child.try_wait() {
Ok(status_opt) => match status_opt {
Some(status) => {
- info!("driver process {} for port {} exited with status {}", child.id(), port_number, status);
- },
+ info!(
+ "driver process {} for port {} exited with status {}",
+ child.id(),
+ port_number,
+ status
+ );
+ }
None => {
//TODO: kill harder
- info!("driver process {} for port {} still running", child.id(), port_number);
+ info!(
+ "driver process {} for port {} still running",
+ child.id(),
+ port_number
+ );
}
},
Err(err) => {
- info!("failed to wait for the driver process {} for port {}: {}", child.id(), port_number, err);
+ info!(
+ "failed to wait for the driver process {} for port {}: {}",
+ child.id(),
+ port_number,
+ err
+ );
}
}
}
Err(err) => {
- warn!("failed to kill the driver process {} for port {}: {}", child.id(), port_number, err);
+ warn!(
+ "failed to kill the driver process {} for port {}: {}",
+ child.id(),
+ port_number,
+ err
+ );
}
}
}
}
if let Some(state) = self.port_states.remove(&port_number) {
- info!("disabling port slot {} for port {}", state.slot, port_number);
+ info!(
+ "disabling port slot {} for port {}",
+ state.slot, port_number
+ );
let result = self.disable_port_slot(state.slot).await;
- info!("disabled port slot {} for port {} with result: {:?}", state.slot, port_number, result);
+ info!(
+ "disabled port slot {} for port {} with result: {:?}",
+ state.slot, port_number, result
+ );
result
} else {