vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use thread::yield_now instead of pause in ahcid, e1000d, and rtl8168d

Browse Source 
Remove debugging from e1000d
This commit is contained in:
Jeremy Soller
2017-03-21 20:52:39 -06:00
parent 898ec5acbd
commit beef16096f
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ahcid/src/ahci/hba.rs
+6 -10
View File
@@ -24,10 +24,6 @@ const HBA_SIG_ATAPI: u32 = 0xEB140101;
const HBA_SIG_PM: u32 = 0x96690101;
const HBA_SIG_SEMB: u32 = 0xC33C0101;
fn pause() {
unsafe { asm!("pause" : : : "memory" : "intel", "volatile"); }
}
#[derive(Debug)]
pub enum HbaPortType {
None,
@@ -77,7 +73,7 @@ impl HbaPort {
pub fn start(&mut self) {
while self.cmd.readf(HBA_PORT_CMD_CR) {
pause();
thread::yield_now();
}
self.cmd.writef(HBA_PORT_CMD_FRE | HBA_PORT_CMD_ST, true);
@@ -87,7 +83,7 @@ impl HbaPort {
self.cmd.writef(HBA_PORT_CMD_ST, false);
while self.cmd.readf(HBA_PORT_CMD_FR | HBA_PORT_CMD_CR) {
pause();
thread::yield_now();
}
self.cmd.writef(HBA_PORT_CMD_FRE, false);
@@ -163,7 +159,7 @@ impl HbaPort {
}
while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {
pause();
thread::yield_now();
}
self.ci.writef(1 << slot, true);
@@ -171,7 +167,7 @@ impl HbaPort {
self.start();
while (self.ci.readf(1 << slot) || self.tfd.readf(0x80)) && self.is.read() & HBA_PORT_IS_ERR == 0 {
pause();
thread::yield_now();
}
self.stop();
@@ -299,7 +295,7 @@ impl HbaPort {
//print!("WAIT ATA_DEV_BUSY | ATA_DEV_DRQ\n");
}
while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {
pause();
thread::yield_now();
}
if write {
@@ -313,7 +309,7 @@ impl HbaPort {
//print!("{}", format!("WAIT CI {:X} in {:X}\n", 1 << slot, self.ci.read()));
}
while (self.ci.readf(1 << slot) || self.tfd.readf(0x80)) && self.is.read() & HBA_PORT_IS_ERR == 0 {
pause();
thread::yield_now();
if write {
//print!("{}", format!("WAIT CI {:X} TFD {:X} IS {:X} CMD {:X} SERR {:X}\n", self.ci.read(), self.tfd.read(), self.is.read(), self.cmd.read(), self.serr.read()));
}
e1000d/src/device.rs
-9
View File
@@ -187,8 +187,6 @@ impl Scheme for Intel8254x {
return Ok(i);
}
unsafe { asm!("pause" : : : "memory" : "intel", "volatile"); }
}
}
@@ -348,13 +346,6 @@ impl Intel8254x {
// TIPG Packet Gap
// TODO ...
print!("{}", format!(" - CTRL: {:X}\n", self.read(CTRL)));
print!("{}", format!(" - STS: {:X}\n", self.read(STATUS)));
print!("{}", format!(" - RCTL: {:X}\n", self.read(RCTL)));
print!("{}", format!(" - TCTL: {:X}\n", self.read(TCTL)));
print!("{}", format!(" - IMS: {:X}\n", self.read(IMS)));
print!(" - Waiting for link up\n");
while self.read(STATUS) & 2 != 2 {
thread::yield_now();
rtl8168d/src/device.rs
+1 -1
View File
@@ -140,7 +140,7 @@ impl SchemeMut for Rtl8168 {
}
}
unsafe { asm!("pause" : : : "memory" : "intel", "volatile"); }
thread::yield_now();
}
}