michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37: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
2021-05-17 11:30:02 +02:00
parent 0f5ed7f715 60664c8876
commit 5ffe8c4cbe
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Cargo.lock generated
View File

@@ -34,8 +34,8 @@ dependencies = [
"pic8259_simple", "pic8259_simple",
"spin", "spin",
"uart_16550", "uart_16550",
"volatile", "volatile 0.2.7",
"x86_64", "x86_64 0.13.6",
] ]
[[package]] [[package]]
@@ -242,12 +242,12 @@ dependencies = [
[[package]] [[package]]
name = "uart_16550" name = "uart_16550"
version = "0.2.12" version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d45a3c9181dc9ba7d35d02b3c36d1604155289d935b7946510fb3d2f4b976d9" checksum = "503a6c0e6d82daa87985e662d120c0176b09587c92a68db22781b28ae95405dd"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"x86_64", "x86_64 0.14.2",
] ]
[[package]] [[package]]
@@ -263,11 +263,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945" checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"
[[package]] [[package]]
name = "x86_64" name = "volatile"
version = "0.13.2" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b871116e3c83dad0795580b10b2b1dd05cb52ec719af36180371877b09681f7f" checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0"
[[package]]
name = "x86_64"
version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "021b49a4cb0a0d9490265cc169ca816014cbf61d3f3b75424815912977b81871"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"bitflags", "bitflags",
] ]
[[package]]
name = "x86_64"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13f09cffc08ee86bf5e4d147f107a43de0885c53ffad799b39f4ad203fb2a27d"
dependencies = [
"bit_field",
"bitflags",
"volatile 0.4.4",
]