From 9fe8f759af6d90305705c39ca2b7d7442b99c3c6 Mon Sep 17 00:00:00 2001 From: Andrey Turkin Date: Wed, 6 Nov 2024 12:13:13 +0300 Subject: [PATCH] Fix formatting and a warning --- src/arch/aarch64/interrupt/mod.rs | 2 +- src/arch/x86_shared/device/local_apic.rs | 1 - src/arch/x86_shared/interrupt/mod.rs | 4 +--- src/scheme/irq.rs | 19 +++++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/arch/aarch64/interrupt/mod.rs b/src/arch/aarch64/interrupt/mod.rs index 008f8c0d29..d5a26c8bcf 100644 --- a/src/arch/aarch64/interrupt/mod.rs +++ b/src/arch/aarch64/interrupt/mod.rs @@ -47,4 +47,4 @@ pub unsafe fn halt() { #[inline(always)] pub fn pause() { unsafe { asm!("nop") }; -} \ No newline at end of file +} diff --git a/src/arch/x86_shared/device/local_apic.rs b/src/arch/x86_shared/device/local_apic.rs index c95dbf606f..3dee3eb970 100644 --- a/src/arch/x86_shared/device/local_apic.rs +++ b/src/arch/x86_shared/device/local_apic.rs @@ -1,7 +1,6 @@ use core::{ cell::SyncUnsafeCell, ptr::{read_volatile, write_volatile}, - sync::atomic::{self, AtomicU32}, }; use x86::msr::*; diff --git a/src/arch/x86_shared/interrupt/mod.rs b/src/arch/x86_shared/interrupt/mod.rs index 33477ac85a..4d794fb73a 100644 --- a/src/arch/x86_shared/interrupt/mod.rs +++ b/src/arch/x86_shared/interrupt/mod.rs @@ -3,9 +3,7 @@ pub mod ipi; pub mod trace; -pub use super::{ - idt::{available_irqs_iter, is_reserved, set_reserved}, -}; +pub use super::idt::{available_irqs_iter, is_reserved, set_reserved}; /// Clear interrupts #[inline(always)] diff --git a/src/scheme/irq.rs b/src/scheme/irq.rs index 39ed73cf75..af48f6add0 100644 --- a/src/scheme/irq.rs +++ b/src/scheme/irq.rs @@ -115,7 +115,11 @@ impl IrqScheme { CPUS.call_once(|| cpus); } - fn open_ext_irq(flags: usize, cpu_id: LogicalCpuId, path_str: &str) -> Result<(Handle, InternalFlags)> { + fn open_ext_irq( + flags: usize, + cpu_id: LogicalCpuId, + path_str: &str, + ) -> Result<(Handle, InternalFlags)> { let irq_number = u8::from_str(path_str).or(Err(Error::new(ENOENT)))?; Ok( @@ -140,11 +144,7 @@ impl IrqScheme { if is_reserved(cpu_id, irq_to_vector(irq_number)) { return Err(Error::new(EEXIST)); } - set_reserved( - cpu_id, - irq_to_vector(irq_number), - true, - ); + set_reserved(cpu_id, irq_to_vector(irq_number), true); } ( Handle::Irq { @@ -227,7 +227,7 @@ impl crate::scheme::KernelScheme for IrqScheme { let mut bytes = String::new(); use core::fmt::Write; - + writeln!(bytes, "bsp").unwrap(); for cpu_id in CPUS.get().expect("IRQ scheme not initialized") { @@ -251,7 +251,10 @@ impl crate::scheme::KernelScheme for IrqScheme { let path_str = path_str[2..].trim_end_matches('/'); if path_str.is_empty() { - (Handle::Avail(LogicalCpuId::new(cpu_id.into())), InternalFlags::POSITIONED) + ( + Handle::Avail(LogicalCpuId::new(cpu_id.into())), + InternalFlags::POSITIONED, + ) } else if path_str.starts_with('/') { let path_str = &path_str[1..]; Self::open_ext_irq(flags, LogicalCpuId::new(cpu_id.into()), path_str)?