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:41:30 +02:00
parent ad63d440cf 64264ce6ec
commit 55baf4f0b6
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -35,7 +35,7 @@ dependencies = [
"spin", "spin",
"uart_16550", "uart_16550",
"volatile 0.2.7", "volatile 0.2.7",
"x86_64 0.13.6", "x86_64",
] ]
[[package]] [[package]]
@@ -205,7 +205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "503a6c0e6d82daa87985e662d120c0176b09587c92a68db22781b28ae95405dd" checksum = "503a6c0e6d82daa87985e662d120c0176b09587c92a68db22781b28ae95405dd"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"x86_64 0.14.2", "x86_64",
] ]
[[package]] [[package]]
@@ -220,16 +220,6 @@ 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 = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0"
[[package]]
name = "x86_64"
version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "021b49a4cb0a0d9490265cc169ca816014cbf61d3f3b75424815912977b81871"
dependencies = [
"bit_field",
"bitflags",
]
[[package]] [[package]]
name = "x86_64" name = "x86_64"
version = "0.14.2" version = "0.14.2"

2
Cargo.toml
View File

@@ -16,7 +16,7 @@ harness = false
bootloader = { version = "0.9.8", features = ["map_physical_memory"]} bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
volatile = "0.2.6" volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"
x86_64 = "0.13.2" x86_64 = "0.14.2"
uart_16550 = "0.2.0" uart_16550 = "0.2.0"
pic8259_simple = "0.2.0" pic8259_simple = "0.2.0"
pc-keyboard = "0.5.0" pc-keyboard = "0.5.0"