Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-29 16:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename aster-frame to ostd

Browse Source
This commit is contained in:
Jianfeng Jiang
2024-06-19 08:18:39 +00:00
committed by Tate, Hongliang Tian
parent fb59fa7a55
commit 59350a8578
300 changed files with 425 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/comps/virtio/src/device/block/device.rs
View File

@ -7,15 +7,15 @@ use aster_block::{
bio::{BioEnqueueError, BioStatus, BioType, SubmittedBio},
request_queue::{BioRequest, BioRequestSingleQueue},
};
use aster_frame::{
use aster_util::safe_ptr::SafePtr;
use id_alloc::IdAlloc;
use log::info;
use ostd::{
io_mem::IoMem,
mm::{DmaDirection, DmaStream, DmaStreamSlice, FrameAllocOptions, VmIo},
sync::SpinLock,
trap::TrapFrame,
};
use aster_util::safe_ptr::SafePtr;
use id_alloc::IdAlloc;
use log::info;
use pod::Pod;
use super::{BlockFeatures, VirtioBlockConfig};

2
kernel/comps/virtio/src/device/block/mod.rs
View File

@ -2,10 +2,10 @@
pub mod device;
use aster_frame::io_mem::IoMem;
use aster_util::safe_ptr::SafePtr;
use bitflags::bitflags;
use int_to_c_enum::TryFromInt;
use ostd::io_mem::IoMem;
use pod::Pod;
use crate::transport::VirtioTransport;

2
kernel/comps/virtio/src/device/console/config.rs
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MPL-2.0
use aster_frame::io_mem::IoMem;
use aster_util::safe_ptr::SafePtr;
use ostd::io_mem::IoMem;
use pod::Pod;
use crate::transport::VirtioTransport;

6
kernel/comps/virtio/src/device/console/device.rs
View File

@ -4,14 +4,14 @@ use alloc::{boxed::Box, fmt::Debug, string::ToString, sync::Arc, vec::Vec};
use core::hint::spin_loop;
use aster_console::{AnyConsoleDevice, ConsoleCallback};
use aster_frame::{
use aster_util::safe_ptr::SafePtr;
use log::debug;
use ostd::{
io_mem::IoMem,
mm::{DmaDirection, DmaStream, DmaStreamSlice, FrameAllocOptions, VmReader},
sync::{RwLock, SpinLock},
trap::TrapFrame,
};
use aster_util::safe_ptr::SafePtr;
use log::debug;
use super::{config::VirtioConsoleConfig, DEVICE_NAME};
use crate::{

14
kernel/comps/virtio/src/device/input/device.rs
View File

@ -8,13 +8,6 @@ use alloc::{
};
use core::{fmt::Debug, iter, mem};
use aster_frame::{
io_mem::IoMem,
mm::{DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, VmIo, PAGE_SIZE},
offset_of,
sync::{RwLock, SpinLock},
trap::TrapFrame,
};
use aster_input::{
key::{Key, KeyStatus},
InputEvent,
@ -22,6 +15,13 @@ use aster_input::{
use aster_util::{field_ptr, safe_ptr::SafePtr};
use bitflags::bitflags;
use log::{debug, info};
use ostd::{
io_mem::IoMem,
mm::{DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, VmIo, PAGE_SIZE},
offset_of,
sync::{RwLock, SpinLock},
trap::TrapFrame,
};
use super::{InputConfigSelect, VirtioInputConfig, VirtioInputEvent, QUEUE_EVENT, QUEUE_STATUS};
use crate::{

2
kernel/comps/virtio/src/device/input/mod.rs
View File

@ -27,8 +27,8 @@
//
pub mod device;
use aster_frame::io_mem::IoMem;
use aster_util::safe_ptr::SafePtr;
use ostd::io_mem::IoMem;
use pod::Pod;
use crate::transport::VirtioTransport;

2
kernel/comps/virtio/src/device/network/config.rs
View File

@ -1,9 +1,9 @@
// SPDX-License-Identifier: MPL-2.0
use aster_frame::io_mem::IoMem;
use aster_network::EthernetAddr;
use aster_util::safe_ptr::SafePtr;
use bitflags::bitflags;
use ostd::io_mem::IoMem;
use pod::Pod;
use crate::transport::VirtioTransport;

2
kernel/comps/virtio/src/device/network/device.rs
View File

@ -3,13 +3,13 @@
use alloc::{boxed::Box, string::ToString, sync::Arc};
use core::{fmt::Debug, hint::spin_loop, mem::size_of};
use aster_frame::{offset_of, sync::SpinLock, trap::TrapFrame};
use aster_network::{
AnyNetworkDevice, EthernetAddr, RxBuffer, TxBuffer, VirtioNetError, RX_BUFFER_POOL,
TX_BUFFER_POOL,
};
use aster_util::{field_ptr, slot_vec::SlotVec};
use log::debug;
use ostd::{offset_of, sync::SpinLock, trap::TrapFrame};
use smoltcp::phy::{DeviceCapabilities, Medium};
use super::{config::VirtioNetConfig, header::VirtioNetHdr};

4
kernel/comps/virtio/src/device/socket/buffer.rs
View File

@ -2,11 +2,11 @@
use alloc::{collections::LinkedList, sync::Arc};
use aster_frame::{
use aster_network::dma_pool::DmaPool;
use ostd::{
mm::{DmaDirection, DmaStream},
sync::SpinLock,
};
use aster_network::dma_pool::DmaPool;
use spin::Once;
const RX_BUFFER_LEN: usize = 4096;

2
kernel/comps/virtio/src/device/socket/config.rs
View File

@ -1,8 +1,8 @@
// SPDX-License-Identifier: MPL-2.0
use aster_frame::io_mem::IoMem;
use aster_util::safe_ptr::SafePtr;
use bitflags::bitflags;
use ostd::io_mem::IoMem;
use pod::Pod;
use crate::transport::VirtioTransport;

2
kernel/comps/virtio/src/device/socket/device.rs
View File

@ -3,10 +3,10 @@
use alloc::{boxed::Box, string::ToString, sync::Arc, vec, vec::Vec};
use core::{fmt::Debug, hint::spin_loop, mem::size_of};
use aster_frame::{mm::VmWriter, offset_of, sync::SpinLock, trap::TrapFrame};
use aster_network::{RxBuffer, TxBuffer};
use aster_util::{field_ptr, slot_vec::SlotVec};
use log::debug;
use ostd::{mm::VmWriter, offset_of, sync::SpinLock, trap::TrapFrame};
use pod::Pod;
use super::{

2
kernel/comps/virtio/src/device/socket/mod.rs
View File

@ -3,7 +3,7 @@
// ! #![feature(linked_list_cursors)]
use alloc::{collections::BTreeMap, string::String, sync::Arc, vec::Vec};
use aster_frame::sync::SpinLock;
use ostd::sync::SpinLock;
use spin::Once;
use self::device::SocketDevice;