misc(kernel): cleanup

Signed-off-by: Anhad Singh <andypythonappdeveloper@gmail.com>

Author: Andy-Python-Programmer

src/aero_kernel/src/arch/x86_64/apic.rs

@@ -29,7 +29,6 @@ use crate::utils::sync::{Mutex, MutexGuard};
 use super::{io, time};
 
 use crate::acpi::madt;
-use crate::PHYSICAL_MEMORY_OFFSET;
 
 const APIC_SPURIOUS_VECTOR: u32 = 0xFF;
 

src/aero_kernel/src/drivers/block/nvme/mod.rs

@@ -21,7 +21,7 @@ mod queue;
 use core::mem::MaybeUninit;
 
 use command::*;
-use queue::*;
+use queue::QueuePair;
 
 use alloc::sync::Arc;
 use alloc::vec::Vec;
@@ -281,8 +281,8 @@ impl<'a> Controller<'a> {
         let bar0 = header.get_bar(0).ok_or(Error::UnknownBar)?;
 
         // All NVMe registers are accessible via BAR0.
-        let (registers_addr, bar_size) = match bar0 {
-            Bar::Memory64 { address, size, .. } => (PhysAddr::new(address), size),
+        let registers_addr = match bar0 {
+            Bar::Memory64 { address, .. } => PhysAddr::new(address),
             _ => return Err(Error::UnknownBar),
         };
 
@@ -538,7 +538,7 @@ impl PciDeviceHandle for Handler<'static> {
 
         for device_name in devices {
             let device = BlockDevice::new(device_name, controller.clone());
-            install_block_device(device).expect("nvme: failed to install the block device")
+            install_block_device(device).expect("nvme: failed to install the block device");
         }
 
         self.controllers.lock().push(controller);
@@ -551,7 +551,7 @@ fn irq_handler(_stack: &mut InterruptStack) {
 
 fn nvme_init() {
     // Register the NVMe device handler.
-    register_device_driver(Handler::new())
+    register_device_driver(Handler::new());
 }
 
 crate::module_init!(nvme_init, ModuleType::Block);

src/aero_kernel/src/drivers/pci.rs

@@ -679,7 +679,9 @@ impl PciHeader {
 
         // bit 0:true  - the BAR is in memory
         // bit 0:false - the BAR is in I/O
-        if !bar.get_bit(0) {
+        if bar.get_bit(0) {
+            Some(Bar::IO(bar.get_bits(2..32)))
+        } else {
             let prefetchable = bar.get_bit(3);
             let address = bar.get_bits(4..32) << 4;
 
@@ -727,8 +729,6 @@ impl PciHeader {
 
                 _ => None,
             }
-        } else {
-            Some(Bar::IO(bar.get_bits(2..32)))
         }
     }
 

src/aero_kernel/src/drivers/pty.rs

@@ -26,7 +26,7 @@ use alloc::sync::{Arc, Weak};
 use alloc::vec::Vec;
 use spin::{Once, RwLock};
 
-use uapi::pty::*;
+use uapi::pty::TIOCGPTN;
 
 use crate::arch::user_copy::UserRef;
 use crate::fs::cache::*;
@@ -107,8 +107,6 @@ struct Master {
 
 impl Master {
     pub fn new() -> Self {
-        use aero_syscall::*;
-
         Self {
             id: PTY_ID.fetch_add(1, Ordering::SeqCst),
             wq: WaitQueue::new(),
@@ -191,8 +189,8 @@ impl TerminalDevice for Slave {
     }
 
     fn detach(&self, task: Arc<Task>) {
-        use aero_syscall::signal::*;
-        use aero_syscall::*;
+        use aero_syscall::signal::SIGINT;
+        use aero_syscall::VINTR;
 
         if !self.master.discipline.termios.lock().is_cooked() {
             return;

src/aero_kernel/src/drivers/uart_16550.rs

@@ -47,7 +47,7 @@ bitflags::bitflags! {
 pub struct SerialPort(u16);
 
 impl SerialPort {
-    #[inline(always)]
+    #[inline]
     pub const fn new(port: u16) -> Self {
         Self(port)
     }
@@ -90,7 +90,7 @@ impl SerialPort {
 
     fn wait_for_line_status(&self, line_status: LineStatus) {
         while !self.line_status().contains(line_status) {
-            core::hint::spin_loop()
+            core::hint::spin_loop();
         }
     }
 

src/aero_kernel/src/fs/block/gpt.rs

@@ -23,7 +23,7 @@ use core::mem::MaybeUninit;
 use alloc::boxed::Box;
 use alloc::sync::Arc;
 
-const GPT_TABLE_SIGNATURE: u64 = 0x5452415020494645;
+const GPT_TABLE_SIGNATURE: u64 = 0x5452_4150_2049_4645;
 
 #[repr(C)]
 pub struct GptTableHeader {

src/aero_kernel/src/fs/inode.rs

@@ -286,7 +286,7 @@ pub trait INodeInterface: Send + Sync {
 }
 
 /// Structure representing the crucial, characteristics of an inode. The metadata
-/// of an inode can be retrieved by invoking the [INodeInterface::metadata] function.
+/// of an inode can be retrieved by invoking the [`INodeInterface::metadata`] function.
 #[derive(Debug, Copy, Clone)]
 pub struct Metadata {
     pub id: usize,
@@ -345,7 +345,7 @@ pub enum FileContents {
     /// and is backed by a static byte buffer
     StaticContent(&'static [u8]),
 
-    /// If the file type of the inode is [FileType::Device], in that case this variant
+    /// If the file type of the inode is [`FileType::Device`], in that case this variant
     /// is used.
     Device(Arc<DevINode>),
 

src/aero_kernel/src/fs/path.rs

@@ -138,7 +138,7 @@ impl PathBuf {
             self.as_mut_vec().truncate(0);
         }
 
-        let need_sep = self.0.chars().last().map(|c| c != '/').unwrap_or(false);
+        let need_sep = self.0.chars().last().is_some_and(|c| c != '/');
 
         // TODO: verbatim pahts need . and .. removed
 

src/aero_kernel/src/mem/mod.rs

@@ -23,9 +23,7 @@ mod vmalloc;
 
 use ::alloc::boxed::Box;
 
-use crate::mem::paging::*;
-
-use self::paging::{active_level_4_table, FRAME_ALLOCATOR};
+use paging::*;
 
 /// Structure representing a *virtual* address space. The address space
 /// contains a reference of the page table allocated for this address space.

src/aero_kernel/src/mem/paging/addr.rs

@@ -97,19 +97,19 @@ impl VirtAddr {
     /// Converts the address to a raw pointer.
     #[cfg(target_pointer_width = "64")]
     #[inline]
-    pub fn as_ptr<T>(self) -> *const T {
+    pub const fn as_ptr<T>(self) -> *const T {
         self.as_u64() as *const T
     }
 
     /// Converts the address to a mutable raw pointer.
     #[cfg(target_pointer_width = "64")]
     #[inline]
-    pub fn as_mut_ptr<T>(self) -> *mut T {
-        self.as_ptr::<T>() as *mut T
+    pub const fn as_mut_ptr<T>(self) -> *mut T {
+        self.as_ptr::<T>().cast_mut()
     }
 
     #[inline]
-    pub fn is_zero(self) -> bool {
+    pub const fn is_zero(self) -> bool {
         self.0 == 0
     }
 
@@ -360,12 +360,6 @@ impl Step for VirtAddr {
     }
 }
 
-/// A passed `u64` was not a valid physical address.
-///
-/// This means that bits 52 to 64 were not all null.
-#[derive(Debug)]
-pub struct PhysAddrNotValid(u64);
-
 impl PhysAddr {
     /// Creates a new physical address.
     ///
@@ -570,7 +564,7 @@ pub fn align_down(addr: u64, align: u64) -> u64 {
 /// Panics if the alignment is not a power of two. Without the `const_fn`
 /// feature, the panic message will be "index out of bounds".
 #[inline]
-pub fn align_up(addr: u64, align: u64) -> u64 {
+pub const fn align_up(addr: u64, align: u64) -> u64 {
     let align_mask = align - 1;
 
     if addr & align_mask == 0 {
@@ -581,7 +575,7 @@ pub fn align_up(addr: u64, align: u64) -> u64 {
 }
 
 #[inline]
-pub fn is_aligned(addr: u64, align: u64) -> bool {
+pub const fn is_aligned(addr: u64, align: u64) -> bool {
     align_up(addr, align) == addr
 }