michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-21 00:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-11' into post-12

Browse Source
This commit is contained in:
Philipp Oppermann
2020-05-20 14:31:12 +02:00
parent a076ff16ad 9828ec0eff
commit 60b5f3402e
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -33,7 +33,7 @@ dependencies = [
"spin",
"uart_16550",
"volatile",
"x86_64",
"x86_64 0.11.0",
]
[[package]]
@@ -188,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44b0f30cb82b0fbc15b78ade1064226529ad52028bc8cb8accb98ff6f3d7131"
dependencies = [
"bitflags",
"x86_64",
"x86_64 0.9.6",
]
[[package]]
@@ -206,3 +206,13 @@ dependencies = [
"bit_field",
"bitflags",
]
[[package]]
name = "x86_64"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "365de37eb7c6da582cbb510dd0f3f1235d24ff6309a8a96e8a9909cc9bfd608f"
dependencies = [
"bit_field",
"bitflags",
]