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

Code cleanup

Browse source
This commit is contained in:
Ryan Kennedy 2020-03-24 16:08:24 -05:00
parent 42d2f4836e
commit 36d92e4123
1 changed files with 32 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/writers/graphics_640x480x16.rs
View file

@ -32,14 +32,9 @@ const WIDTH_IN_BYTES: usize = WIDTH / 8;
pub struct Graphics640x480x16; pub struct Graphics640x480x16;
impl GraphicsWriter<Color16Bit> for Graphics640x480x16 { impl GraphicsWriter<Color16Bit> for Graphics640x480x16 {
/// Clears the screen by setting all pixels to the specified `color`.
fn clear_screen(&self, color: Color16Bit) { fn clear_screen(&self, color: Color16Bit) {
let (mut vga, frame_buffer) = self.get_frame_buffer(); self.set_write_mode_2();
vga.graphics_controller_registers let (_vga, frame_buffer) = self.get_frame_buffer();
.set_write_mode(WriteMode::Mode2);
vga.graphics_controller_registers.set_bit_mask(0xFF);
vga.sequencer_registers
.set_plane_mask(PlaneMask::ALL_PLANES);
for offset in 0..ALL_PLANES_SCREEN_SIZE { for offset in 0..ALL_PLANES_SCREEN_SIZE {
unsafe { unsafe {
frame_buffer.add(offset).write_volatile(u8::from(color)); frame_buffer.add(offset).write_volatile(u8::from(color));
@ -47,64 +42,36 @@ impl GraphicsWriter<Color16Bit> for Graphics640x480x16 {
} }
} }
/// Draws a line from `start` to `end` with the specified `color`.
fn draw_line(&self, start: Point<isize>, end: Point<isize>, color: Color16Bit) { fn draw_line(&self, start: Point<isize>, end: Point<isize>, color: Color16Bit) {
{ self.set_write_mode_0(color);
let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers.write_set_reset(color);
vga.graphics_controller_registers
.write_enable_set_reset(0xF);
vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode0);
}
for (x, y) in Bresenham::new(start, end) { for (x, y) in Bresenham::new(start, end) {
self._set_pixel(x as usize, y as usize, color); self._set_pixel(x as usize, y as usize, color);
} }
} }
fn draw_character(&self, x: usize, y: usize, character: char, color: Color16Bit) { fn draw_character(&self, x: usize, y: usize, character: char, color: Color16Bit) {
self.set_write_mode_2();
let character = match font8x8::BASIC_FONTS.get(character) { let character = match font8x8::BASIC_FONTS.get(character) {
Some(character) => character, Some(character) => character,
// Default to a filled block if the character isn't found
None => font8x8::unicode::BLOCK_UNICODE[8].byte_array(), None => font8x8::unicode::BLOCK_UNICODE[8].byte_array(),
}; };
{ for (row, byte) in character.iter().enumerate() {
let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode2);
vga.graphics_controller_registers.set_bit_mask(0xFF);
vga.sequencer_registers
.set_plane_mask(PlaneMask::ALL_PLANES);
}
for (y1, byte) in character.iter().enumerate() {
for bit in 0..8 { for bit in 0..8 {
match *byte & 1 << bit { match *byte & 1 << bit {
0 => {} 0 => (),
_ => self._set_pixel(x + bit, y + y1, color), _ => self._set_pixel(x + bit, y + row, color),
} }
} }
} }
} }
/// Sets the given pixel at `(x, y)` to the given `color`.
///
/// **Note:** This method is provided for convenience, but has terrible
/// performance since it needs to ensure the correct `WriteMode` per pixel
/// drawn. If you need to draw more then one pixel, consider using a method
/// such as `draw_line`.
fn set_pixel(&self, x: usize, y: usize, color: Color16Bit) { fn set_pixel(&self, x: usize, y: usize, color: Color16Bit) {
{ self.set_write_mode_2();
let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode2);
}
self._set_pixel(x, y, color); self._set_pixel(x, y, color);
} }
/// Sets the graphics device to `VideoMode::Mode640x480x16`.
fn set_mode(&self) { fn set_mode(&self) {
let mut vga = VGA.lock(); let mut vga = VGA.lock();
vga.set_video_mode(VideoMode::Mode640x480x16); vga.set_video_mode(VideoMode::Mode640x480x16);
@ -121,6 +88,29 @@ impl Graphics640x480x16 {
Graphics640x480x16 {} Graphics640x480x16 {}
} }
/// Sets the vga to 'WriteMode::Mode0`. This also sets `GraphicsControllerIndex::SetReset`
/// to the specified `color`, `GraphicsControllerIndex::EnableSetReset` to `0xFF` and
/// `SequencerIndex::PlaneMask` to `PlaneMask::ALL_PLANES`.
pub fn set_write_mode_0(&self, color: Color16Bit) {
let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers.write_set_reset(color);
vga.graphics_controller_registers
.write_enable_set_reset(0xF);
vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode0);
}
/// Sets the vga to `WriteMode::Mode2`. This also sets the `GraphicsControllerIndex::BitMask`
/// to `0xFF` and `SequencerIndex::PlaneMask` to `PlaneMask::ALL_PLANES`.
pub fn set_write_mode_2(&self) {
let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode2);
vga.graphics_controller_registers.set_bit_mask(0xFF);
vga.sequencer_registers
.set_plane_mask(PlaneMask::ALL_PLANES);
}
/// Returns the start of the `FrameBuffer` as `*mut u8` as /// Returns the start of the `FrameBuffer` as `*mut u8` as
/// well as a lock to the vga driver. This ensures the vga /// well as a lock to the vga driver. This ensures the vga
/// driver stays locked while the frame buffer is in use. /// driver stays locked while the frame buffer is in use.