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

_set_pixel

Browse source
This commit is contained in:
Ryan Kennedy 2020-03-23 19:38:56 -05:00
parent 81f48f8153
commit 543eddbef7
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/writers/graphics_640x480x16.rs
View file

@ -52,21 +52,17 @@ impl Graphics640x480x16 {
/// Draws a line from `start` to `end` with the specified `color`. /// Draws a line from `start` to `end` with the specified `color`.
pub fn draw_line(&self, start: Point<isize>, end: Point<isize>, color: Color16Bit) { pub fn draw_line(&self, start: Point<isize>, end: Point<isize>, color: Color16Bit) {
let (mut vga, frame_buffer) = self.get_frame_buffer(); {
vga.graphics_controller_registers.write_set_reset(color); let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers vga.graphics_controller_registers.write_set_reset(color);
.write_enable_set_reset(0xF); vga.graphics_controller_registers
vga.graphics_controller_registers .write_enable_set_reset(0xF);
.set_write_mode(WriteMode::Mode0); 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) {
let offset = (x as usize / 8) + (y as usize * WIDTH_IN_BYTES); self._set_pixel(x as usize, y as usize, color);
let pixel_mask = 0x80 >> (x & 0x07);
vga.graphics_controller_registers.set_bit_mask(pixel_mask);
unsafe {
frame_buffer.add(offset).read_volatile();
frame_buffer.add(offset).write_volatile(0x00);
}
} }
} }
@ -77,16 +73,13 @@ impl Graphics640x480x16 {
/// drawn. If you need to draw more then one pixel, consider using a method /// drawn. If you need to draw more then one pixel, consider using a method
/// such as `draw_line`. /// such as `draw_line`.
pub fn set_pixel(&self, x: usize, y: usize, color: Color16Bit) { pub fn set_pixel(&self, x: usize, y: usize, color: Color16Bit) {
let (mut vga, frame_buffer) = self.get_frame_buffer(); {
let offset = x / 8 + y * WIDTH_IN_BYTES; let (mut vga, _frame_buffer) = self.get_frame_buffer();
let pixel_mask = 0x80 >> (x & 0x07); vga.graphics_controller_registers
vga.graphics_controller_registers .set_write_mode(WriteMode::Mode2);
.set_write_mode(WriteMode::Mode2);
vga.graphics_controller_registers.set_bit_mask(pixel_mask);
unsafe {
frame_buffer.add(offset).read_volatile();
frame_buffer.add(offset).write_volatile(u8::from(color));
} }
self._set_pixel(x, y, color);
} }
/// Sets the graphics device to `VideoMode::Mode640x480x16`. /// Sets the graphics device to `VideoMode::Mode640x480x16`.
@ -107,4 +100,16 @@ impl Graphics640x480x16 {
let frame_buffer = vga.get_frame_buffer(); let frame_buffer = vga.get_frame_buffer();
(vga, u32::from(frame_buffer) as *mut u8) (vga, u32::from(frame_buffer) as *mut u8)
} }
#[inline]
fn _set_pixel(&self, x: usize, y: usize, color: Color16Bit) {
let (mut vga, frame_buffer) = self.get_frame_buffer();
let offset = x / 8 + y * WIDTH_IN_BYTES;
let pixel_mask = 0x80 >> (x & 0x07);
vga.graphics_controller_registers.set_bit_mask(pixel_mask);
unsafe {
frame_buffer.add(offset).read_volatile();
frame_buffer.add(offset).write_volatile(u8::from(color));
}
}
} }