Patch sysfs #254
Merged
Patch sysfs #254
Conversation
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
fslongjin
requested changes
Apr 23, 2023
kernel/src/driver/base/device/mod.rs
Outdated
| /// @brief: 获取设备的sys information | ||
| /// @parameter id_table: 设备标识符，用于唯一标识该设备 | ||
| /// @return: 设备实例 | ||
| fn get_sys_info(&self) -> Option<Arc<dyn IndexNode>>; |
There was a problem hiding this comment.
rust里面get方法一般不加get_前缀哈哈。也就是说，这个函数改为sys_info()会符合rust的编码习惯
kernel/src/driver/base/device/mod.rs
Outdated
| } | ||
|
|
||
| lazy_static! { | ||
| pub static ref DEVICE_MANAGER: Arc<LockedDeviceManager> = Arc::new(LockedDeviceManager::new()); |
| } | ||
|
|
||
| lazy_static! { | ||
| pub static ref DRIVER_MANAGER: Arc<LockedDriverManager> = Arc::new(LockedDriverManager::new()); |
| let _ = bus_register(platform_device.clone()); | ||
| platform_device.set_state(BusState::Initialized); | ||
| platform_device.set_driver(Some(platform_driver.clone())); | ||
| let _ = bus_driver_register(platform_driver.clone()); | ||
| } | ||
|
|
||
| #[no_mangle] | ||
| extern "C" fn c_platform_bus_init() { |
| let _ = BUS_PLATFORM_DEVICE.register_bus("platform"); | ||
| let platform_driver: Arc<LockedPlatformBusDriver> = Arc::new(LockedPlatformBusDriver::new()); | ||
| let platform_device: Arc<LockedPlatform> = Arc::new(LockedPlatform::new()); | ||
| let _ = bus_register(platform_device.clone()); |
There was a problem hiding this comment.
如果注册的时候产生错误，我觉得应该要报告出来，而不是忽略它。
| /// @brief: 初始化platform总线 | ||
| /// @parameter: None | ||
| /// @return: None | ||
| #[allow(dead_code)] | ||
| pub fn platform_bus_init() { |
There was a problem hiding this comment.
这里我觉得返回Result<(),SystemError>比较好
docs/kernel/filesystem/sysfs-rust.md
Outdated
| @@ -0,0 +1,103 @@ | |||
| ### DragonOS-Sysfs | |||
fslongjin
approved these changes
Apr 23, 2023
fslongjin
added a commit
that referenced
this pull request
Apr 28, 2023
* 新增VFS文档，以及修改文档配置 (#209) * 1.新增vfs设计文档 2.修改文档版权标志为"2022-2023, DragonOS Community" 3.修改电脑版文档页面的宽度为90% * layout.html末尾加空行 * 修正了FAT32判断逻辑，解决了文件系统为FAT12/16时系统无法正常启动的问题。 (#211) * fix(fat): fix determination of fat type casue crash if fs is fat12/16 * refactor(fat): split BiosParameterBlock.validate() into BiosParameterBlockFAT32.validate() and BiosParameterBlockLegacy.validate() * 调整“最大允许的簇号”的常量放置的位置。 * 增加x87FPU支持 (#212) * remove `ret_from_syscall` *修复ps2键盘驱动程序inode在进程fork的时候导致死锁的问题. *更新: VFS每次拷贝文件描述符的时候,都会去调用inode的open函数 * 部分函数从返回值为Result<<>,i32>修改为Result<<>,SystemError> (#210) * 将Result<<>,i32>替换为Result<<>,SystemError> * bugfix: 显示双缓冲区初始化的时候，连续注册了两次Video Softirq的问题。 * 第一套键盘扫描码的状态机 (#216) 第一套键盘扫描码的状态机 * 将TTY与stdio进行连接,实现基本的stdio功能 (#217) * 将stdio与tty接上 * Patch keyboard capslock alt (#219) * keyboard-alt-capslock * 解决键盘输入'%'字符的时候无法回显的bug * Add dup,dup2 (#224) * dup,dup2 * fix: sys_dup2语义与posix不一致的问题 * 添加了qemu使用VNC作为图像输出的选项 (#222) * 添加了qemu使用VNC作为图像输出的选项 * 设置vnc端口为5900 * 软中断&定时器重构 (#223) * 软中断&定时器重构 * 修改timer的clock() * 删除debug信息 * V0.1.6发行日志&更新构建系统文档 (#225) 1.更新构建系统文档 2.V0.1.6发行日志 * Patch add 0.1.6 changelog (#226) * 修正标题错误 * 修复显示刷新线程的空指针问题 (#228) * 新增设备驱动模型，为设备和驱动提供高层视图 (#227) * 添加base mod * 添加设备驱动模型相关文件 * 删除单独的mod文件，使用mod.rs，修改一些格式上的问题 * 移动驱动错误类型到该文件 * 修改一些格式上的问题 * 修改CFSqueue从Vec变成红黑树 (#229) 使用了由tickbh编写的rbtree： https://github.com/tickbh/rbtree-rs/blob/master/src/lib.rs * new: lazy_init (#230) * Patch add lazy init (#236) * 修正并发安全问题 * pci重构+pcie支持 (#235) * pci重构+pcie支持 * pci重构测试完成 * 修正makefile的问题 * 小修改 * 修改函数名字 * 增加对dhcpv4的支持（tcp、udp socket已写好，但由于缺少epoll机制，尚未完整测试） (#237) * 为virtio网卡完成smoltcp的phy层配置 * raw socket * 初步写完udp和tcp socket * 能够正常通过dhcp获取ipv4地址（具有全局iface btree) * 调整brk系统调用，使得参数、返回值与Linux一致 (#238) * 新增用于测试relibc的app * 为适配relibc,修改do_execve中关于用户栈的内容的设置 * 调整brk系统调用，使得参数、返回值与Linux一致 * 修改errno,使其与relibc的保持一致 (#234) 修改errno,使其与relibc的保持一致 * 修复ecam无法获取MCFG table的问题 (#241) * 修复Issue#220；vnc的端口号恢复5900 (#243) * 修复Issue#220 * qemu-vnc端口号恢复为5900 * new: DowncastArc and its docs (#244) * 增加定时器和软中断文档，修改了softirq面向c的接口 (#245) * 增加定时器和软中断文档 * 修改softirq对c的接口和文档 * 修改文档格式 * 新增网络socket的系统调用接口 (#247) 1.修复spinlock忘记恢复rflags的问题 2.WaitQueue增加wakeup_all的功能 3.完善tcp,udp,raw socket 4.把PollStatus结构体改为使用bitflags 5.新增iovec结构体 6.完成网络的系统调用 7.在bootstrap里面添加dnsmasq bridge-utils iptables * 新增SysFS (#250) * 添加sysfs * 注册sysfs * 添加sysfs相关 * 添加rust-anlyzer辅助配置 * 将设备与sysfs相关联 * 添加单独的文件管理sysfs下的文件夹 * 解决使用zsh在构建DragonOS时，无法直接使用一键初始化脚本进行安装的问题 (#252) * 匿名管道重构&增加IrqArch trait以及IrqFlags及其守卫 (#253) * 实现匿名管道 * 增加IrqArch trait以及IrqFlags及其守卫 * 根据sysfs完善设备驱动模型 & 添加sysfs官方文档 (#254) * 根据sysfs完善设备驱动模型 * 添加sysfs官方文档 * doc: V0.1.7发行日志 (#255)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
完善sysfs代码