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

Browse Source
This commit is contained in:
Philipp Oppermann
2020-05-21 09:29:56 +02:00
parent 5e510e41ee b9f5b43c04
commit 8b90c04c62
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@@ -34,9 +34,9 @@ checksum = "44ac0bdf4930c3c4d7f0d04eb6f15d7dcb9d5972b1ff9cd2bee0128112260fc7"
[[package]] [[package]]
name = "cpuio" name = "cpuio"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22b8e308ccfc5acf3b82f79c0eac444cf6114cb2ac67a230ca6c177210068daa" checksum = "d531514efb06912141fa65967447de805691b685a7565c87d1765afe34a98aa7"
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
@@ -55,9 +55,9 @@ checksum = "c48392db76c4e9a69e0b3be356c5f97ebb7b14413c5e4fd0af4755dbf86e2fce"
[[package]] [[package]]
name = "pic8259_simple" name = "pic8259_simple"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc64b2fd10828da8521b6cdabe0679385d7d2a3a6d4c336b819d1fa31ba35c72" checksum = "af2a5497fb8e59bf8015f67b7dff238d75ef445e03f23edac24ac3a8f09be952"
dependencies = [ dependencies = [
"cpuio", "cpuio",
] ]

2
Cargo.toml
View File

@@ -18,7 +18,7 @@ volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"
x86_64 = "0.11.0" x86_64 = "0.11.0"
uart_16550 = "0.2.0" uart_16550 = "0.2.0"
pic8259_simple = "0.1.1" pic8259_simple = "0.2.0"
pc-keyboard = "0.5.0" pc-keyboard = "0.5.0"
[dependencies.lazy_static] [dependencies.lazy_static]