Remove non-AHCI pci id

master
Jiajie Chen 6 years ago
parent 51868e1616
commit 51c463e120

@ -157,9 +157,8 @@ pub fn init_driver(dev: &PCIDevice) {
); );
} }
} }
(0x8086, 0x2922) | (0x8086, 0xa282) | (0x8086, 0x8d02) => { (0x8086, 0x2922) | (0x8086, 0x8d02) => {
// 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode] // 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
// 200 Series PCH SATA controller [AHCI mode]
// C610/X99 series chipset 6-Port SATA Controller [AHCI mode] // C610/X99 series chipset 6-Port SATA Controller [AHCI mode]
if let Some(BAR::Memory(addr, len, _, _)) = dev.bars[5] { if let Some(BAR::Memory(addr, len, _, _)) = dev.bars[5] {
let irq = unsafe { enable(dev.loc) }; let irq = unsafe { enable(dev.loc) };

@ -33,10 +33,12 @@ impl Condvar {
return lock; return lock;
} }
/// Wait for condvar until condition() returns Some
pub fn wait_event<T>(condvar: &Condvar, mut condition: impl FnMut() -> Option<T>) -> T { pub fn wait_event<T>(condvar: &Condvar, mut condition: impl FnMut() -> Option<T>) -> T {
Self::wait_events(&[condvar], condition) Self::wait_events(&[condvar], condition)
} }
/// Wait for condvars until condition() returns Some
pub fn wait_events<T>(condvars: &[&Condvar], mut condition: impl FnMut() -> Option<T>) -> T { pub fn wait_events<T>(condvars: &[&Condvar], mut condition: impl FnMut() -> Option<T>) -> T {
let thread = thread::current(); let thread = thread::current();
let tid = thread.id(); let tid = thread.id();

Loading…
Cancel
Save