Update virtio-drivers, modify two APIs

arceos-org · Sep 27, 2023 · 501619f · 501619f
1 parent 51a42ea
commit 501619f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/driver_pci/Cargo.toml b/crates/driver_pci/Cargo.toml
@@ -10,4 +10,5 @@ repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_pci"
 documentation = "https://rcore-os.github.io/arceos/driver_pci/index.html"
 
 [dependencies]
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
+# virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
+virtio-drivers = { git = "https://github.com/hky1999/virtio-drivers.git", rev = "80d1652" }
diff --git a/crates/driver_virtio/Cargo.toml b/crates/driver_virtio/Cargo.toml
@@ -19,4 +19,5 @@ driver_common = { path = "../driver_common" }
 driver_block = { path = "../driver_block", optional = true }
 driver_net = { path = "../driver_net", optional = true }
 driver_display = { path = "../driver_display", optional = true}
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
+# virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers.git", rev = "409ee72" }
+virtio-drivers = { git = "https://github.com/hky1999/virtio-drivers.git", rev = "80d1652" }
diff --git a/crates/driver_virtio/src/net.rs b/crates/driver_virtio/src/net.rs
@@ -90,12 +90,12 @@ impl<H: Hal, T: Transport, const QS: usize> NetDriverOps for VirtIoNetDev<H, T,
 
     #[inline]
     fn can_transmit(&self) -> bool {
-        !self.free_tx_bufs.is_empty() && self.inner.can_transmit()
+        !self.free_tx_bufs.is_empty() && self.inner.can_send()
     }
 
     #[inline]
     fn can_receive(&self) -> bool {
-        self.inner.can_receive()
+        self.inner.can_recv()
     }
 
     #[inline]