From b33a1e7d9548e4110aac3a6bfcb1934776182379 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 27 Sep 2016 21:27:32 -0600 Subject: [PATCH] Remove debugging --- drivers/ahcid/src/ahci/hba.rs | 6 +----- initfs/etc/init.rc | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/ahcid/src/ahci/hba.rs b/drivers/ahcid/src/ahci/hba.rs index 015b733..a5b3a13 100644 --- a/drivers/ahcid/src/ahci/hba.rs +++ b/drivers/ahcid/src/ahci/hba.rs @@ -218,15 +218,13 @@ impl HbaPort { } pub fn ata_dma(&mut self, block: u64, sectors: usize, write: bool, clb: &mut Dma<[HbaCmdHeader; 32]>, ctbas: &mut [Dma; 32], buf: &mut Dma<[u8; 256 * 512]>) -> Result { - println!("AHCI {:X} DMA BLOCK: {:X} SECTORS: {} WRITE: {}", (self as *mut HbaPort) as usize, block, sectors, write); + //println!("AHCI {:X} DMA BLOCK: {:X} SECTORS: {} WRITE: {}", (self as *mut HbaPort) as usize, block, sectors, write); assert!(sectors > 0 && sectors < 256); self.is.write(u32::MAX); if let Some(slot) = self.slot() { - println!("Slot {}", slot); - let cmdheader = &mut clb[slot as usize]; cmdheader.cfl.write(((size_of::() / size_of::()) as u8)); @@ -268,12 +266,10 @@ impl HbaPort { cmdfis.counth.write((sectors >> 8) as u8); } - println!("Busy Wait"); while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {} self.ci.writef(1 << slot, true); - println!("Completion Wait"); while self.ci.readf(1 << slot) { if self.is.readf(HBA_PORT_IS_TFES) { return Err(Error::new(EIO)); diff --git a/initfs/etc/init.rc b/initfs/etc/init.rc index e46d40d..d4e8892 100644 --- a/initfs/etc/init.rc +++ b/initfs/etc/init.rc @@ -1,5 +1,4 @@ initfs:bin/vesad initfs:bin/ps2d initfs:bin/pcid initfs:etc/pcid.toml -#initfs:bin/example initfs:bin/login display: initfs:bin/ion