From 51c463e120571303dcfda3cba32778d41e791402 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Fri, 24 May 2019 08:28:47 +0800 Subject: [PATCH] Remove non-AHCI pci id --- kernel/src/drivers/bus/pci.rs | 3 +-- kernel/src/sync/condvar.rs | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/src/drivers/bus/pci.rs b/kernel/src/drivers/bus/pci.rs index 1c6f103..60ca629 100644 --- a/kernel/src/drivers/bus/pci.rs +++ b/kernel/src/drivers/bus/pci.rs @@ -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] - // 200 Series PCH SATA controller [AHCI mode] // C610/X99 series chipset 6-Port SATA Controller [AHCI mode] if let Some(BAR::Memory(addr, len, _, _)) = dev.bars[5] { let irq = unsafe { enable(dev.loc) }; diff --git a/kernel/src/sync/condvar.rs b/kernel/src/sync/condvar.rs index b7c6f0f..e9e4ae0 100644 --- a/kernel/src/sync/condvar.rs +++ b/kernel/src/sync/condvar.rs @@ -33,10 +33,12 @@ impl Condvar { return lock; } + /// Wait for condvar until condition() returns Some pub fn wait_event(condvar: &Condvar, mut condition: impl FnMut() -> Option) -> T { Self::wait_events(&[condvar], condition) } + /// Wait for condvars until condition() returns Some pub fn wait_events(condvars: &[&Condvar], mut condition: impl FnMut() -> Option) -> T { let thread = thread::current(); let tid = thread.id();