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

Refactor drivers

Browse Source
This commit is contained in:
Yuke Peng
2023-11-20 20:37:51 +08:00
committed by Tate, Hongliang Tian
parent d809eca81d
commit edd808bd3d
12 changed files with 87 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/comps/network/src/driver.rs
View File

@ -3,10 +3,10 @@ use smoltcp::{phy, time::Instant};
use crate::{
buffer::{RxBuffer, TxBuffer},
NetworkDevice,
AnyNetworkDevice,
};
impl phy::Device for dyn NetworkDevice {
impl phy::Device for dyn AnyNetworkDevice {
type RxToken<'a> = RxToken;
type TxToken<'a> = TxToken<'a>;
@ -43,7 +43,7 @@ impl phy::RxToken for RxToken {
}
}
pub struct TxToken<'a>(&'a mut dyn NetworkDevice);
pub struct TxToken<'a>(&'a mut dyn AnyNetworkDevice);
impl<'a> phy::TxToken for TxToken<'a> {
fn consume<R, F>(self, len: usize, f: F) -> R

36
services/comps/network/src/lib.rs
View File

@ -35,7 +35,7 @@ pub enum VirtioNetError {
Unknown,
}
pub trait NetworkDevice: Send + Sync + Any + Debug {
pub trait AnyNetworkDevice: Send + Sync + Any + Debug {
// ================Device Information=================
fn mac_addr(&self) -> EthernetAddr;
@ -54,33 +54,33 @@ pub trait NetworkDevice: Send + Sync + Any + Debug {
pub trait NetDeviceIrqHandler = Fn() + Send + Sync + 'static;
pub fn register_device(name: String, device: Arc<SpinLock<Box<dyn NetworkDevice>>>) {
pub fn register_device(name: String, device: Arc<SpinLock<Box<dyn AnyNetworkDevice>>>) {
COMPONENT
.get()
.unwrap()
.devices
.network_device_table
.lock()
.insert(name, (Arc::new(SpinLock::new(Vec::new())), device));
}
pub fn get_device(str: &String) -> Option<Arc<SpinLock<Box<dyn NetworkDevice>>>> {
let lock = COMPONENT.get().unwrap().devices.lock();
pub fn get_device(str: &str) -> Option<Arc<SpinLock<Box<dyn AnyNetworkDevice>>>> {
let lock = COMPONENT.get().unwrap().network_device_table.lock();
let Some((_, device)) = lock.get(str) else {
return None;
};
Some(device.clone())
}
pub fn register_recv_callback(name: &String, callback: impl NetDeviceIrqHandler) {
let lock = COMPONENT.get().unwrap().devices.lock();
pub fn register_recv_callback(name: &str, callback: impl NetDeviceIrqHandler) {
let lock = COMPONENT.get().unwrap().network_device_table.lock();
let Some((callbacks, _)) = lock.get(name) else {
return;
};
callbacks.lock().push(Arc::new(callback));
}
pub fn handle_recv_irq(name: &String) {
let lock = COMPONENT.get().unwrap().devices.lock();
pub fn handle_recv_irq(name: &str) {
let lock = COMPONENT.get().unwrap().network_device_table.lock();
let Some((callbacks, _)) = lock.get(name) else {
return;
};
@ -92,12 +92,11 @@ pub fn handle_recv_irq(name: &String) {
}
pub fn all_devices() -> Vec<(String, NetworkDeviceRef)> {
let lock = COMPONENT.get().unwrap().devices.lock();
let mut vec = Vec::new();
for (name, (_, device)) in lock.iter() {
vec.push((name.clone(), device.clone()));
}
vec
let network_devs = COMPONENT.get().unwrap().network_device_table.lock();
network_devs
.iter()
.map(|(name, (_, device))| (name.clone(), device.clone()))
.collect()
}
static COMPONENT: Once<Component> = Once::new();
@ -113,17 +112,18 @@ fn init() -> Result<(), ComponentInitError> {
}
type NetDeviceIrqHandlerListRef = Arc<SpinLock<Vec<Arc<dyn NetDeviceIrqHandler>>>>;
type NetworkDeviceRef = Arc<SpinLock<Box<dyn NetworkDevice>>>;
type NetworkDeviceRef = Arc<SpinLock<Box<dyn AnyNetworkDevice>>>;
struct Component {
/// Device list, the key is device name, value is (callbacks, device);
devices: SpinLock<BTreeMap<String, (NetDeviceIrqHandlerListRef, NetworkDeviceRef)>>,
network_device_table:
SpinLock<BTreeMap<String, (NetDeviceIrqHandlerListRef, NetworkDeviceRef)>>,
}
impl Component {
pub fn init() -> Result<Self, ComponentInitError> {
Ok(Self {
devices: SpinLock::new(BTreeMap::new()),
network_device_table: SpinLock::new(BTreeMap::new()),
})
}
}