Merge branch 'post-06' into post-07

This commit is contained in:
Philipp Oppermann
2020-07-17 11:23:46 +02:00
5 changed files with 115 additions and 66 deletions

11
Cargo.lock generated
View File

@@ -20,6 +20,7 @@ dependencies = [
"lazy_static",
"pc-keyboard",
"pic8259_simple",
"rlibc",
"spin",
"uart_16550",
"volatile",
@@ -28,9 +29,9 @@ dependencies = [
[[package]]
name = "bootloader"
version = "0.9.3"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44ac0bdf4930c3c4d7f0d04eb6f15d7dcb9d5972b1ff9cd2bee0128112260fc7"
checksum = "0ad686b9b47363de7d36c05fb6885f17d08d0f2d15b1bc782a101fe3c94a2c7c"
[[package]]
name = "cpuio"
@@ -62,6 +63,12 @@ dependencies = [
"cpuio",
]
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
[[package]]
name = "spin"
version = "0.5.2"