Merge pull request #15 from rust-osdev/develop

Develop
pull/20/head
RKennedy9064 2020-05-21 17:11:04 -05:00 committed by GitHub
commit bb087860e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "vga"
version = "0.2.3"
version = "0.2.4"
authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
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"

View File

@ -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`.

View File

@ -5,13 +5,13 @@ authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
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"
pic8259_simple = "0.2.0"
vga = { path = "../" }
uart_16550 = "0.2.4"
x86_64 = "0.9.6"
uart_16550 = "0.2.7"
x86_64 = "0.11.0"
[package.metadata.bootimage]
test-args = [