michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-21 00:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-05' into post-06

Browse Source
This commit is contained in:
Philipp Oppermann
2019-05-09 14:59:55 +02:00
parent 5a68816b45 2dfc5e838a
commit 01040fc643
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -16,7 +16,7 @@ harness = false
bootloader = "0.6.0"
volatile = "0.2.3"
spin = "0.4.9"
x86_64 = "0.6.0"
x86_64 = "0.7.0"
uart_16550 = "0.2.0"
[dependencies.lazy_static]
@@ -32,7 +32,7 @@ panic = "abort"
[package.metadata.bootimage]
default-target = "x86_64-blog_os.json"
test-args = [
"-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "mon:stdio",
"-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio",
"-display", "none"
]
test-success-exit-code = 33 # (0x10 << 1) | 1