vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove debugging

Browse source
This commit is contained in:
Jeremy Soller 2016-09-27 21:27:32 -06:00
parent cde825bed9
commit b33a1e7d95
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/ahcid/src/ahci/hba.rs
View file

@ -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<HbaCmdTable>; 32], buf: &mut Dma<[u8; 256 * 512]>) -> Result<usize> { pub fn ata_dma(&mut self, block: u64, sectors: usize, write: bool, clb: &mut Dma<[HbaCmdHeader; 32]>, ctbas: &mut [Dma<HbaCmdTable>; 32], buf: &mut Dma<[u8; 256 * 512]>) -> Result<usize> {
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); assert!(sectors > 0 && sectors < 256);
self.is.write(u32::MAX); self.is.write(u32::MAX);
if let Some(slot) = self.slot() { if let Some(slot) = self.slot() {
println!("Slot {}", slot);
let cmdheader = &mut clb[slot as usize]; let cmdheader = &mut clb[slot as usize];
cmdheader.cfl.write(((size_of::<FisRegH2D>() / size_of::<u32>()) as u8)); cmdheader.cfl.write(((size_of::<FisRegH2D>() / size_of::<u32>()) as u8));
@ -268,12 +266,10 @@ impl HbaPort {
cmdfis.counth.write((sectors >> 8) as u8); cmdfis.counth.write((sectors >> 8) as u8);
} }
println!("Busy Wait");
while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {} while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {}
self.ci.writef(1 << slot, true); self.ci.writef(1 << slot, true);
println!("Completion Wait");
while self.ci.readf(1 << slot) { while self.ci.readf(1 << slot) {
if self.is.readf(HBA_PORT_IS_TFES) { if self.is.readf(HBA_PORT_IS_TFES) {
return Err(Error::new(EIO)); return Err(Error::new(EIO));

1
initfs/etc/init.rc
View file

@ -1,5 +1,4 @@
initfs:bin/vesad initfs:bin/vesad
initfs:bin/ps2d initfs:bin/ps2d
initfs:bin/pcid initfs:etc/pcid.toml initfs:bin/pcid initfs:etc/pcid.toml
#initfs:bin/example
initfs:bin/login display: initfs:bin/ion initfs:bin/login display: initfs:bin/ion