able/vga
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #15 from rust-osdev/develop

Browse source 
Develop
This commit is contained in:
RKennedy9064 2020-05-21 17:11:04 -05:00 committed by GitHub
parent 7ff25184ce 3a5e941966
commit b1d71e76d8
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "vga" name = "vga"
version = "0.2.3" version = "0.2.4"
authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"] authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
edition = "2018" edition = "2018"
description = "Support for vga specific functions, data structures, and registers." 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 } conquer-once = { version = "0.2.0", default-features = false }
font8x8 = { version = "0.2.5", default-features = false, features = ["unicode"] } font8x8 = { version = "0.2.5", default-features = false, features = ["unicode"] }
spinning_top = { version = "0.1.0", features = ["nightly"] } spinning_top = { version = "0.1.0", features = ["nightly"] }
x86_64 = "0.9.6" x86_64 = "0.11.0"
[dependencies.num-traits] [dependencies.num-traits]
version = "0.2.11" version = "0.2.11"

4
Changelog.md
View file

@ -1,3 +1,7 @@
# 0.2.4
- Updated `x86_64` to fix deprecated `asm!` macro.
# 0.2.3 # 0.2.3
- Added support for 320x240x256 mode via `Graphics320x240x256`. - Added support for 320x240x256 mode via `Graphics320x240x256`.

8
testing/Cargo.toml
View file

@ -5,13 +5,13 @@ authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
edition = "2018" edition = "2018"
[dependencies] [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 } conquer-once = { version = "0.2.0", default-features = false }
spinning_top = { version = "0.1.0", features = ["nightly"] } spinning_top = { version = "0.1.0", features = ["nightly"] }
pic8259_simple = "0.1.1" pic8259_simple = "0.2.0"
vga = { path = "../" } vga = { path = "../" }
uart_16550 = "0.2.4" uart_16550 = "0.2.7"
x86_64 = "0.9.6" x86_64 = "0.11.0"
[package.metadata.bootimage] [package.metadata.bootimage]
test-args = [ test-args = [