Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-26 10:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade POD and trapframe

Browse Source
This commit is contained in:
Yuke Peng
2023-07-04 08:16:08 -07:00
committed by Tate, Hongliang Tian
parent c21c25a7d5
commit 829575b3a6
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -754,7 +754,7 @@ checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]] [[package]]
name = "pod" name = "pod"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/jinzhao-dev/pod?rev=7fa2ed2#7fa2ed2bb8344856f98f0d533ecb1bab238f79ba" source = "git+https://github.com/jinzhao-dev/pod?rev=71e59ec#71e59ec1ddf6562e8a928f609f2048a69a5297b0"
dependencies = [ dependencies = [
"pod-derive", "pod-derive",
] ]
@ -762,7 +762,7 @@ dependencies = [
[[package]] [[package]]
name = "pod-derive" name = "pod-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/jinzhao-dev/pod?rev=7fa2ed2#7fa2ed2bb8344856f98f0d533ecb1bab238f79ba" source = "git+https://github.com/jinzhao-dev/pod?rev=71e59ec#71e59ec1ddf6562e8a928f609f2048a69a5297b0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1054,7 +1054,7 @@ dependencies = [
[[package]] [[package]]
name = "trapframe" name = "trapframe"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/sdww0/trapframe-rs?rev=4234db5#4234db5ceb667a46c3a7b68b63a5e9ef25993ef9" source = "git+https://github.com/sdww0/trapframe-rs?rev=d4c5eba#d4c5ebab73d2295d69e2fcc66f51b9ae2883f8d9"
dependencies = [ dependencies = [
"log", "log",
"pod", "pod",

4
framework/jinux-frame/Cargo.toml
View File

@ -11,12 +11,12 @@ cfg-if = "1.0"
spin = "0.9.4" spin = "0.9.4"
volatile = { version = "0.4.5", features = ["unstable"] } volatile = { version = "0.4.5", features = ["unstable"] }
buddy_system_allocator = "0.9.0" buddy_system_allocator = "0.9.0"
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "71e59ec" }
align_ext = { path = "../libs/align_ext" } align_ext = { path = "../libs/align_ext" }
intrusive-collections = "0.9.5" intrusive-collections = "0.9.5"
log = "0.4" log = "0.4"
lazy_static = { version = "1.0", features = ["spin_no_std"] } lazy_static = { version = "1.0", features = ["spin_no_std"] }
trapframe = { git = "https://github.com/sdww0/trapframe-rs", rev = "4234db5" } trapframe = { git = "https://github.com/sdww0/trapframe-rs", rev = "e886763" }
inherit-methods-macro = { git = "https://github.com/jinzhao-dev/inherit-methods-macro", rev = "98f7e3e" } inherit-methods-macro = { git = "https://github.com/jinzhao-dev/inherit-methods-macro", rev = "98f7e3e" }
[target.x86_64-custom.dependencies] [target.x86_64-custom.dependencies]

2
services/comps/pci/Cargo.toml
View File

@ -10,7 +10,7 @@ bitflags = "1.3"
spin = "0.9.4" spin = "0.9.4"
jinux-frame = { path = "../../../framework/jinux-frame" } jinux-frame = { path = "../../../framework/jinux-frame" }
jinux-util = { path = "../../libs/jinux-util" } jinux-util = { path = "../../libs/jinux-util" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "71e59ec" }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
log = "0.4" log = "0.4"

2
services/comps/virtio/Cargo.toml
View File

@ -13,7 +13,7 @@ align_ext = { path = "../../../framework/libs/align_ext" }
jinux-frame = { path = "../../../framework/jinux-frame" } jinux-frame = { path = "../../../framework/jinux-frame" }
jinux-pci = { path = "../pci" } jinux-pci = { path = "../pci" }
jinux-util = { path = "../../libs/jinux-util" } jinux-util = { path = "../../libs/jinux-util" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "71e59ec" }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
log = "0.4" log = "0.4"
int-to-c-enum = { path = "../../libs/int-to-c-enum" } int-to-c-enum = { path = "../../libs/int-to-c-enum" }

2
services/libs/jinux-std/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2021"
[dependencies] [dependencies]
jinux-frame = { path = "../../../framework/jinux-frame" } jinux-frame = { path = "../../../framework/jinux-frame" }
align_ext = { path = "../../../framework/libs/align_ext" } align_ext = { path = "../../../framework/libs/align_ext" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "71e59ec" }
jinux-input = { path = "../../comps/input" } jinux-input = { path = "../../comps/input" }
jinux-block = { path = "../../comps/block" } jinux-block = { path = "../../comps/block" }
jinux-network = { path = "../../comps/network" } jinux-network = { path = "../../comps/network" }

2
services/libs/jinux-util/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
[dependencies] [dependencies]
jinux-frame = { path = "../../../framework/jinux-frame" } jinux-frame = { path = "../../../framework/jinux-frame" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "71e59ec" }
typeflags-util = { path = "../typeflags-util" } typeflags-util = { path = "../typeflags-util" }
jinux-rights-proc = { path = "../jinux-rights-proc" } jinux-rights-proc = { path = "../jinux-rights-proc" }
jinux-rights = { path = "../jinux-rights" } jinux-rights = { path = "../jinux-rights" }