From c711f22e63d9a0e4a3d8409e9e385f6a2bda18f9 Mon Sep 17 00:00:00 2001 From: Ryan Kennedy Date: Thu, 21 May 2020 16:56:17 -0500 Subject: [PATCH 1/2] Deprecated asm! macro --- Cargo.toml | 4 ++-- Changelog.md | 4 ++++ testing/Cargo.toml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bf7fbd3..5b69a22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vga" -version = "0.2.3" +version = "0.2.4" authors = ["Ryan Kennedy "] edition = "2018" description = "Support for vga specific functions, data structures, and registers." @@ -23,7 +23,7 @@ bitflags = "1.2.1" conquer-once = { version = "0.2.0", default-features = false } font8x8 = { version = "0.2.5", default-features = false, features = ["unicode"] } spinning_top = { version = "0.1.0", features = ["nightly"] } -x86_64 = "0.9.6" +x86_64 = "0.11.0" [dependencies.num-traits] version = "0.2.11" diff --git a/Changelog.md b/Changelog.md index babb358..d3f34ad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.2.4 + +- Updated `x86_64` to fix deprecated `asm!` macro. + # 0.2.3 - Added support for 320x240x256 mode via `Graphics320x240x256`. diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 124f0d6..3ec238e 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Ryan Kennedy "] edition = "2018" [dependencies] -bootloader = { version = "0.9.0", features = ["map_physical_memory"] } +bootloader = { version = "0.9.3", features = ["map_physical_memory"] } conquer-once = { version = "0.2.0", default-features = false } spinning_top = { version = "0.1.0", features = ["nightly"] } pic8259_simple = "0.1.1" vga = { path = "../" } uart_16550 = "0.2.4" -x86_64 = "0.9.6" +x86_64 = "0.11.0" [package.metadata.bootimage] test-args = [ From 3a5e941966e497af8a34329c47c83928e74aaffb Mon Sep 17 00:00:00 2001 From: Ryan Kennedy Date: Thu, 21 May 2020 17:04:49 -0500 Subject: [PATCH 2/2] Fixing tests --- testing/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 3ec238e..5df603b 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" bootloader = { version = "0.9.3", features = ["map_physical_memory"] } conquer-once = { version = "0.2.0", default-features = false } spinning_top = { version = "0.1.0", features = ["nightly"] } -pic8259_simple = "0.1.1" +pic8259_simple = "0.2.0" vga = { path = "../" } -uart_16550 = "0.2.4" +uart_16550 = "0.2.7" x86_64 = "0.11.0" [package.metadata.bootimage]