Merge branch 'post-10' into post-11

This commit is contained in:
Philipp Oppermann
2021-02-02 11:06:38 +01:00
2 changed files with 5 additions and 5 deletions

8
Cargo.lock generated
View File

@@ -104,9 +104,9 @@ dependencies = [
[[package]]
name = "uart_16550"
version = "0.2.9"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07777999215cbf8772f7974116039b439b1bddb90302d293c5a578d1d3a763d"
checksum = "8d45a3c9181dc9ba7d35d02b3c36d1604155289d935b7946510fb3d2f4b976d9"
dependencies = [
"bitflags",
"x86_64",
@@ -120,9 +120,9 @@ checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"
[[package]]
name = "x86_64"
version = "0.12.2"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5b4b42dbabe13b69023e1a1407d395f1a1a33df76e9a9efdbe303acc907e292"
checksum = "b871116e3c83dad0795580b10b2b1dd05cb52ec719af36180371877b09681f7f"
dependencies = [
"bit_field",
"bitflags",

View File

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