Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of new SpinLock APIs

Browse Source
This commit is contained in:
Ruihan Li
2024-09-12 09:52:40 +08:00
committed by Tate, Hongliang Tian
parent 67d3682116
commit 1b9b76d27c
3 changed files with 36 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/src/net/iface/init.rs
View File

@ -3,7 +3,7 @@
use alloc::{borrow::ToOwned, sync::Arc};
use aster_bigtcp::device::WithDevice;
use ostd::sync::PreemptDisabled;
use ostd::sync::LocalIrqDisabled;
use spin::Once;
use super::{poll_ifaces, Iface};
@ -39,9 +39,9 @@ fn new_virtio() -> Arc<Iface> {
let virtio_net = aster_network::get_device(DEVICE_NAME).unwrap();
let ether_addr = virtio_net.disable_irq().lock().mac_addr().0;
let ether_addr = virtio_net.lock().mac_addr().0;
struct Wrapper(Arc<SpinLock<dyn AnyNetworkDevice, PreemptDisabled>>);
struct Wrapper(Arc<SpinLock<dyn AnyNetworkDevice, LocalIrqDisabled>>);
impl WithDevice for Wrapper {
type Device = dyn AnyNetworkDevice;
@ -50,7 +50,7 @@ fn new_virtio() -> Arc<Iface> {
where
F: FnOnce(&mut Self::Device) -> R,
{
let mut device = self.0.disable_irq().lock();
let mut device = self.0.lock();
f(&mut *device)
}
}