michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +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:56:19 +02:00
parent 60b5f3402e 6f12524245
commit 0404ceb1af
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@@ -33,7 +33,7 @@ dependencies = [
"spin",
"uart_16550",
"volatile",
"x86_64 0.11.0",
"x86_64",
]
[[package]]
@@ -183,12 +183,12 @@ dependencies = [
[[package]]
name = "uart_16550"
version = "0.2.4"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44b0f30cb82b0fbc15b78ade1064226529ad52028bc8cb8accb98ff6f3d7131"
checksum = "e58fc40dc1712664fc9b0a7bd8ca2f21ab49960924fb245a80a05e1e92f3dfe9"
dependencies = [
"bitflags",
"x86_64 0.9.6",
"x86_64",
]
[[package]]
@@ -197,16 +197,6 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
[[package]]
name = "x86_64"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4206b60c9f99766329b66962aa8ddc01df6c7edd02edc046b7a69d5df9fcdbcf"
dependencies = [
"bit_field",
"bitflags",
]
[[package]]
name = "x86_64"
version = "0.11.0"