Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Muzi
OSKernel2023-NutOS
Commits
f3780e5f
Commit
f3780e5f
authored
1 year ago
by
xu_zh
Browse files
Options
Download
Plain Diff
Merge branch 'main' into 'dev/socket'
# Conflicts: # kernel/include/fs.h
parents
6012903c
c882d6d3
Changes
70
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Makefile
+11
-2
Makefile
README.md
+3
-1
README.md
arch/riscv/include/vm.h
+7
-0
arch/riscv/include/vm.h
arch/riscv/kernel/vm/vm.cpp
+51
-3
arch/riscv/kernel/vm/vm.cpp
docs/final-1-report.md
+182
-0
docs/final-1-report.md
docs/pre-report.md
+0
-0
docs/pre-report.md
docs/reference/玄铁C906用户手册.pdf
+0
-0
docs/reference/玄铁C906用户手册.pdf
driver/virtio/virtio-blk.cpp
+6
-0
driver/virtio/virtio-blk.cpp
kernel/fs/devfs/fs.cpp
+7
-0
kernel/fs/devfs/fs.cpp
kernel/fs/dir.cpp
+17
-16
kernel/fs/dir.cpp
kernel/fs/fat32/fat32.cpp
+4
-0
kernel/fs/fat32/fat32.cpp
kernel/fs/fat32/fs.cpp
+4
-1
kernel/fs/fat32/fs.cpp
kernel/fs/fat32/local.h
+1
-0
kernel/fs/fat32/local.h
kernel/fs/fat32/mmap.cpp
+29
-19
kernel/fs/fat32/mmap.cpp
kernel/fs/fdesp.cpp
+8
-8
kernel/fs/fdesp.cpp
kernel/fs/fs.cpp
+74
-19
kernel/fs/fs.cpp
kernel/fs/initramfs/fs.cpp
+2
-2
kernel/fs/initramfs/fs.cpp
kernel/fs/mmap.cpp
+208
-178
kernel/fs/mmap.cpp
kernel/fs/procfs/fs.cpp
+3
-0
kernel/fs/procfs/fs.cpp
kernel/fs/strace.cpp
+1
-0
kernel/fs/strace.cpp
with
618 additions
and
249 deletions
+618
-249
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment