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

Yield unstead of spinning without interruption for loops in e1000d, add information about link speed

Browse Source
This commit is contained in:
Jeremy Soller
2017-03-21 20:38:27 -06:00
parent 050abc1a7e
commit 3a8e40d78c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e1000d/src/device.rs
+11 -8
View File
@@ -182,7 +182,7 @@ impl Scheme for Intel8254x {
unsafe { self.write(TDT, tail) };
while td.status == 0 {
unsafe { asm!("pause" : : : "memory" : "intel", "volatile"); }
thread::yield_now();
}
return Ok(i);
@@ -269,11 +269,9 @@ impl Intel8254x {
pub unsafe fn init(&mut self) {
self.flag(CTRL, CTRL_RST, true);
loop {
thread::sleep(time::Duration::new(0, 1000));
if self.read(CTRL) & CTRL_RST != CTRL_RST {
break;
}
thread::sleep(time::Duration::new(0, 1000));
while self.read(CTRL) & CTRL_RST == CTRL_RST {
thread::yield_now();
}
// Enable auto negotiate, link, clear reset, do not Invert Loss-Of Signal
@@ -357,9 +355,14 @@ impl Intel8254x {
print!("{}", format!(" - IMS: {:X}\n", self.read(IMS)));
print!(" - Waiting for link up\n");
while self.read(STATUS) & 2 != 2 {
print!(" - Waiting for link up\n");
thread::sleep(time::Duration::new(1, 0));
thread::yield_now();
}
print!(" - Link is up with speed {}\n", match (self.read(STATUS) >> 6) & 0b11 {
0b00 => "10 Mb/s",
0b01 => "100 Mb/s",
_ => "1000 Mb/s",
});
}
}