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-06' into post-07

Browse Source
This commit is contained in:
Philipp Oppermann
2019-12-10 17:31:24 +01:00
parent 3ffd71723f 8d8a7e0973
commit dfd65d579c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -32,7 +32,7 @@ dependencies = [
"spin", "spin",
"uart_16550", "uart_16550",
"volatile", "volatile",
"x86_64 0.8.0", "x86_64 0.8.1",
] ]
[[package]] [[package]]
@@ -153,9 +153,9 @@ dependencies = [
[[package]] [[package]]
name = "x86_64" name = "x86_64"
version = "0.8.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a16d71284451a78134cae89ad63d5a0b0cc4b3aa663399f6a9dad74155228c61" checksum = "f21672dcbed52bc09eea030d189600c0189c66c97bc5b31779eb780e064a201f"
dependencies = [ dependencies = [
"array-init", "array-init",
"bit_field", "bit_field",

2
Cargo.toml
View File

@@ -16,7 +16,7 @@ harness = false
bootloader = "0.8.0" bootloader = "0.8.0"
volatile = "0.2.6" volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"
x86_64 = "0.8.0" x86_64 = "0.8.1"
uart_16550 = "0.2.0" uart_16550 = "0.2.0"
pic8259_simple = "0.1.1" pic8259_simple = "0.1.1"
pc-keyboard = "0.3.1" pc-keyboard = "0.3.1"