-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. remove the simplegui and virtio-input-decoder module. 2. add new vfs framework a. impl VfsInode trait for every device b. construct file tree
- Loading branch information
Showing
73 changed files
with
1,405 additions
and
2,850 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,83 @@ | ||
| use alloc::sync::Arc; | ||
|
|
||
| use crate::driver::GenericBlockDevice; | ||
| use crate::fs::dev::DeviceId; | ||
| use rvfs::superblock::Device; | ||
| use spin::Once; | ||
| use vfscore::error::VfsError; | ||
| use vfscore::file::VfsFile; | ||
| use vfscore::inode::{InodeAttr, VfsInode}; | ||
| use vfscore::superblock::VfsSuperBlock; | ||
| use vfscore::utils::{FileStat, PollEvents, VfsNodeType}; | ||
| use vfscore::VfsResult; | ||
|
|
||
| use crate::interrupt::DeviceBase; | ||
|
|
||
| pub trait BlockDevice: Device + DeviceBase {} | ||
|
|
||
| pub static BLOCK_DEVICE: Once<Arc<dyn Device>> = Once::new(); | ||
| pub static BLOCK_DEVICE: Once<Arc<GenericBlockDevice>> = Once::new(); | ||
|
|
||
| pub fn init_block_device(block_device: Arc<dyn Device>) { | ||
| pub fn init_block_device(block_device: Arc<GenericBlockDevice>) { | ||
| // BLOCK_DEVICE.lock().push(block_device); | ||
| BLOCK_DEVICE.call_once(|| block_device); | ||
| } | ||
|
|
||
| pub struct BLKDevice { | ||
| device_id: DeviceId, | ||
| device: Arc<GenericBlockDevice>, | ||
| } | ||
|
|
||
| impl BLKDevice { | ||
| pub fn new(device_id: DeviceId, device: Arc<GenericBlockDevice>) -> Self { | ||
| Self { device_id, device } | ||
| } | ||
| pub fn device_id(&self) -> DeviceId { | ||
| self.device_id | ||
| } | ||
| } | ||
|
|
||
| impl VfsFile for BLKDevice { | ||
| fn read_at(&self, offset: u64, buf: &mut [u8]) -> VfsResult<usize> { | ||
| self.device | ||
| .read(buf, offset as usize) | ||
| .map_err(|_| VfsError::IoError) | ||
| } | ||
| fn write_at(&self, offset: u64, buf: &[u8]) -> VfsResult<usize> { | ||
| self.device | ||
| .write(buf, offset as usize) | ||
| .map_err(|_| VfsError::IoError) | ||
| } | ||
| fn poll(&self, _event: PollEvents) -> VfsResult<PollEvents> { | ||
| todo!() | ||
| } | ||
| fn ioctl(&self, _cmd: u32, _arg: u64) -> VfsResult<Option<u64>> { | ||
| todo!() | ||
| } | ||
| fn flush(&self) -> VfsResult<()> { | ||
| Ok(()) | ||
| } | ||
| fn fsync(&self) -> VfsResult<()> { | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| impl VfsInode for BLKDevice { | ||
| fn get_super_block(&self) -> VfsResult<Arc<dyn VfsSuperBlock>> { | ||
| Err(VfsError::NoSys) | ||
| } | ||
|
|
||
| fn set_attr(&self, _attr: InodeAttr) -> VfsResult<()> { | ||
| Ok(()) | ||
| } | ||
|
|
||
| fn get_attr(&self) -> VfsResult<FileStat> { | ||
| Ok(FileStat { | ||
| st_rdev: self.device_id.id(), | ||
| ..Default::default() | ||
| }) | ||
| } | ||
|
|
||
| fn inode_type(&self) -> VfsNodeType { | ||
| VfsNodeType::BlockDevice | ||
| } | ||
| } |
Oops, something went wrong.