michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37: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 16:55:41 +01:00
parent d4c256c653 16c499f966
commit 617d0e6db6
3 changed files with 15 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@@ -32,7 +32,7 @@ dependencies = [
"spin",
"uart_16550",
"volatile",
"x86_64",
"x86_64 0.8.0",
]
[[package]]
@@ -123,7 +123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b"
dependencies = [
"bitflags",
"x86_64",
"x86_64 0.7.7",
]
[[package]]
@@ -150,3 +150,15 @@ dependencies = [
"cast",
"ux",
]
[[package]]
name = "x86_64"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a16d71284451a78134cae89ad63d5a0b0cc4b3aa663399f6a9dad74155228c61"
dependencies = [
"array-init",
"bit_field",
"bitflags",
"cast",
]