Skip to content

Commit c881bdc

Browse files
committed
move Console to extern crate
also remove x86_64 VGA text mode support
1 parent 100f3b9 commit c881bdc

File tree

16 files changed

+135
-1007
lines changed

16 files changed

+135
-1007
lines changed

kernel/Cargo.lock

Lines changed: 40 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kernel/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,15 @@ xmas-elf = "0.7"
5353
bitflags = "1.1"
5454
bit_field = "0.10"
5555
volatile = "0.2"
56-
heapless = "0.5"
5756
bitvec = { version = "0.14", default-features = false, features = ["alloc"] }
58-
console-traits = "0.3"
5957
buddy_system_allocator = "0.3"
6058
pci = { git = "https://github.com/rcore-os/pci-rs" }
6159
device_tree = { git = "https://github.com/rcore-os/device_tree-rs" }
6260
isomorphic_drivers = { git = "https://github.com/rcore-os/isomorphic_drivers", features = ["log"] }
6361
lazy_static = { version = "1.3", features = ["spin_no_std"] }
6462
smoltcp = { git = "https://github.com/rcore-os/smoltcp", default-features = false, features = ["alloc", "log", "proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
6563
bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" }
64+
rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "f09eae7" }
6665
rcore-memory = { path = "../crate/memory" }
6766
rcore-thread = { git = "https://github.com/rcore-os/rcore-thread" }
6867
rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "33f86c47" }

kernel/src/arch/x86_64/board/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> FramebufferResul
7272
fb::ColorConfig::RGB565
7373
} else {
7474
// assume BGRA8888 for now
75-
fb::ColorConfig::BGRA8888
75+
fb::ColorConfig::RGBA8888
7676
};
7777
Ok((fb_info, config, phys_to_virt(framebuffer)))
7878
}

kernel/src/arch/x86_64/driver/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pub mod pic;
44
pub mod pit;
55
pub mod rtc_cmos;
66
pub mod serial;
7-
pub mod vga;
87

98
use super::{board, BootInfo};
109

0 commit comments

Comments
 (0)