Skip to content

Commit 56b516d

Browse files
committed
code fmt
1 parent 6fad0ff commit 56b516d

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

modules/axdriver/src/dyn_drivers/pci.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
extern crate alloc;
22

3-
use alloc::format;
4-
53
use crate::dyn_drivers::iomap;
6-
use axhal::mem::PhysAddr;
74
use memory_addr::MemoryAddr;
85
use rdrive::probe::fdt::PciSpace;
96
use rdrive::probe::pci::*;
10-
use rdrive::{
11-
DriverGeneric, PlatformDevice, module_driver, probe::OnProbeError, register::FdtInfo,
12-
};
7+
use rdrive::{PlatformDevice, module_driver, probe::OnProbeError, register::FdtInfo};
138

149
module_driver!(
1510
name: "Generic PCIe Controller Driver",

modules/axruntime/src/lib.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ fn init_allocator() {
229229
use_next_free = true;
230230
} else if r.flags.contains(MemRegionFlags::FREE) {
231231
if use_next_free {
232-
max_region_size = r.size;
233232
max_region_paddr = r.paddr;
234233
break;
235234
} else if r.size > max_region_size {
@@ -293,19 +292,3 @@ fn init_tls() {
293292
unsafe { axhal::asm::write_thread_pointer(main_tls.tls_ptr() as usize) };
294293
core::mem::forget(main_tls);
295294
}
296-
297-
#[cfg(feature = "driver-dyn")]
298-
fn iomap(addr: axhal::mem::PhysAddr, size: usize) -> axerrno::AxResult<axhal::mem::VirtAddr> {
299-
let virt = axhal::mem::phys_to_virt(addr);
300-
#[cfg(feature = "paging")]
301-
{
302-
use axhal::paging::MappingFlags;
303-
304-
let flags = MappingFlags::DEVICE | MappingFlags::READ | MappingFlags::WRITE;
305-
let mut tb = axmm::kernel_aspace().lock();
306-
tb.map_linear(virt, addr, size, flags)?;
307-
// flush TLB
308-
tb.protect(virt, size, flags)?;
309-
}
310-
Ok(virt)
311-
}

0 commit comments

Comments
 (0)