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

Merge #604 #606

Browse Source 
604: Use `-serial stdio` instead of `-serial mon:stdio` r=phil-opp a=phil-opp

Fixes #602 

Post update in https://github.com/phil-opp/blog_os/pull/605

606: Update x86_64 to version 0.7.0 r=phil-opp a=phil-opp

[Changelog](https://github.com/rust-osdev/x86_64/blob/master/Changelog.md#070):

- **Breaking**: `Port::read` and `PortReadOnly::read` now take `&mut self` instead of `&self` ([#76](https://github.com/rust-osdev/x86_64/pull/76)).

Post update in https://github.com/phil-opp/blog_os/pull/607

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
This commit is contained in:
bors[bot]
2019-05-09 12:42:42 +00:00
parent ac9b661395 86b57f696f 3098be9653
commit 158aed0c18
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

@@ -12,7 +12,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]
@@ -28,7 +28,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