DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-21 22:43:23 +00:00
Code Issues Releases Wiki Activity

将 io 移动至 vfs 目录，并修正引用路径 (#339)

Browse Source 
* 将 io 移动至 vfs 目录，并修正引用路径

* fix bug in makefile
This commit is contained in:
Xshine
2023-08-27 15:54:19 +08:00
committed by GitHub
parent e92d022810
commit ddb9d91712
22 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/driver/disk/ahci/ahci_inode.rs
View File

@ -1,10 +1,10 @@
use crate::filesystem::devfs::{DevFS, DeviceINode};
use crate::filesystem::vfs::file::FileMode;
use crate::filesystem::vfs::io::device::BlockDevice;
use crate::filesystem::vfs::{
core::generate_inode_id, make_rawdev, FilePrivateData, FileSystem, FileType, IndexNode,
Metadata, PollStatus,
};
use crate::io::device::BlockDevice;
use crate::syscall::SystemError;
use crate::{libs::spinlock::SpinLock, time::TimeSpec};
use alloc::{

14
kernel/src/driver/disk/ahci/ahcidisk.rs
View File

@ -1,8 +1,8 @@
use super::{_port, hba::HbaCmdTable, virt_2_phys};
use crate::driver::disk::ahci::HBA_PxIS_TFES;
use crate::filesystem::mbr::MbrDiskPartionTable;
use crate::filesystem::vfs::io::{device::BlockDevice, disk_info::Partition, SeekFrom};
use crate::include::bindings::bindings::verify_area;
use crate::io::{device::BlockDevice, disk_info::Partition, SeekFrom};
use crate::libs::{spinlock::SpinLock, vec_cursor::VecCursor};
use crate::mm::phys_2_virt;
@ -52,8 +52,8 @@ impl Debug for AhciDisk {
impl AhciDisk {
fn read_at(
&self,
lba_id_start: crate::io::device::BlockId, // 起始lba编号
count: usize, // 读取lba的数量
lba_id_start: crate::filesystem::vfs::io::device::BlockId, // 起始lba编号
count: usize, // 读取lba的数量
buf: &mut [u8],
) -> Result<usize, SystemError> {
compiler_fence(core::sync::atomic::Ordering::SeqCst);
@ -211,7 +211,7 @@ impl AhciDisk {
fn write_at(
&self,
lba_id_start: crate::io::device::BlockId,
lba_id_start: crate::filesystem::vfs::io::device::BlockId,
count: usize,
buf: &[u8],
) -> Result<usize, SystemError> {
@ -449,7 +449,7 @@ impl BlockDevice for LockedAhciDisk {
#[inline]
fn read_at(
&self,
lba_id_start: crate::io::device::BlockId,
lba_id_start: crate::filesystem::vfs::io::device::BlockId,
count: usize,
buf: &mut [u8],
) -> Result<usize, SystemError> {
@ -463,7 +463,7 @@ impl BlockDevice for LockedAhciDisk {
#[inline]
fn write_at(
&self,
lba_id_start: crate::io::device::BlockId,
lba_id_start: crate::filesystem::vfs::io::device::BlockId,
count: usize,
buf: &[u8],
) -> Result<usize, SystemError> {
@ -475,7 +475,7 @@ impl BlockDevice for LockedAhciDisk {
}
#[inline]
fn device(&self) -> Arc<dyn crate::io::device::Device> {
fn device(&self) -> Arc<dyn crate::filesystem::vfs::io::device::Device> {
return self.0.lock().self_ref.upgrade().unwrap();
}

4
kernel/src/driver/disk/ahci/mod.rs
View File

@ -3,10 +3,10 @@ pub mod ahci_inode;
pub mod ahcidisk;
pub mod hba;
use crate::io::device::BlockDevice;
use crate::filesystem::vfs::io::device::BlockDevice;
// 依赖的rust工具包
use crate::filesystem::devfs::devfs_register;
use crate::io::disk_info::BLK_GF_AHCI;
use crate::filesystem::vfs::io::disk_info::BLK_GF_AHCI;
use crate::kerror;
use crate::libs::spinlock::{SpinLock, SpinLockGuard};
use crate::mm::virt_2_phys;