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

Browse Source
This commit is contained in:
Philipp Oppermann
2020-05-20 14:26:48 +02:00
parent 50853609d1 067f2c9b39
commit 8d5aade432
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -23,7 +23,7 @@ dependencies = [
"spin",
"uart_16550",
"volatile",
"x86_64",
"x86_64 0.11.0",
]
[[package]]
@@ -75,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44b0f30cb82b0fbc15b78ade1064226529ad52028bc8cb8accb98ff6f3d7131"
dependencies = [
"bitflags",
"x86_64",
"x86_64 0.9.6",
]
[[package]]
@@ -93,3 +93,13 @@ dependencies = [
"bit_field",
"bitflags",
]
[[package]]
name = "x86_64"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "365de37eb7c6da582cbb510dd0f3f1235d24ff6309a8a96e8a9909cc9bfd608f"
dependencies = [
"bit_field",
"bitflags",
]

2
Cargo.toml
View File

@@ -16,7 +16,7 @@ harness = false
bootloader = "0.9.3"
volatile = "0.2.6"
spin = "0.5.2"
x86_64 = "0.9.6"
x86_64 = "0.11.0"
uart_16550 = "0.2.0"
pic8259_simple = "0.1.1"
pc-keyboard = "0.5.0"