fix: cleanup

This commit is contained in:
Zoe
2026-08-27 13:18:57 -05:00
parent 7dcf244ee6
commit 8a71cdfcc5
11 changed files with 52 additions and 201 deletions
+1 -13
View File
@@ -2,11 +2,10 @@ use crate::{
memory::{
AddressSpace, CachePolicy, FrameAllocator, PagePermissions, PhysicalAddr, VirtualAddr,
},
platform::acpi::{InterruptPolarity, IoApicInfo, TriggerMode},
platform::acpi::{InterruptPolarity, TriggerMode},
println,
};
const IOREGSEL: usize = 0x00;
const IOWIN: usize = 0x10;
const IOAPIC_ID: u8 = 0x00;
@@ -132,17 +131,6 @@ impl IoApic {
}
}
fn read_redirection(&mut self, gsi: u32) -> Result<u64, IoApicError> {
let index = self.redirection_index(gsi)?;
let register = u8::try_from(IOAPIC_REDIRECTION_BASE as u32 + index * 2)
.map_err(|_| IoApicError::InvalidRedirectionIndex)?;
let low = self.read(register);
let high = self.read(register + 1);
Ok((high as u64) << 32 | low as u64)
}
fn redirection_registers(&mut self, gsi: u32) -> Result<(u8, u8), IoApicError> {
let index = self.redirection_index(gsi)?;
let low_register = u8::try_from(IOAPIC_REDIRECTION_BASE as u32 + index * 2)