Debug all driver activity to display:1, use format to avoid line splitting
This commit is contained in:
parent
d71081110e
commit
418149bb07
1 changed files with 43 additions and 70 deletions
|
|
@ -8,21 +8,19 @@ pub mod fis;
|
|||
pub mod hba;
|
||||
|
||||
pub fn disks(base: usize, irq: u8) -> Vec<Disk> {
|
||||
println!(" + AHCI on: {:X} IRQ: {}", base as usize, irq);
|
||||
|
||||
let pi = unsafe { &mut *(base as *mut HbaMem) }.pi.read();
|
||||
let ret: Vec<Disk> = (0..32)
|
||||
.filter(|&i| pi & 1 << i as i32 == 1 << i as i32)
|
||||
.filter_map(|i| {
|
||||
let port = &mut unsafe { &mut *(base as *mut HbaMem) }.ports[i];
|
||||
let port_type = port.probe();
|
||||
println!("{}: {:?}", i, port_type);
|
||||
print!("{}", format!("{}: {:?}\n", i, port_type));
|
||||
match port_type {
|
||||
HbaPortType::SATA => {
|
||||
match Disk::new(i, port) {
|
||||
Ok(disk) => Some(disk),
|
||||
Err(err) => {
|
||||
println!("{}: {}", i, err);
|
||||
print!("{}", format!("{}: {}\n", i, err));
|
||||
None
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue