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

Fix lint

Browse source
This commit is contained in:
Daniel Beckwith 2020-03-31 18:35:59 -04:00
parent 19d41fd146
commit 66b4ccf6d0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/writers/graphics_320x200x256.rs
View file

@ -97,7 +97,7 @@ impl Graphics320x200x256 {
/// 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.
fn get_frame_buffer(&self) -> (SpinlockGuard<Vga>, *mut u8) { fn get_frame_buffer(self) -> (SpinlockGuard<Vga>, *mut u8) {
let mut vga = VGA.lock(); let mut vga = VGA.lock();
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)

8
src/writers/graphics_640x480x16.rs
View file

@ -106,7 +106,7 @@ impl Graphics640x480x16 {
Graphics640x480x16 Graphics640x480x16
} }
fn set_write_mode_0(&self, color: Color16) { fn set_write_mode_0(self, color: Color16) {
let (mut vga, _frame_buffer) = self.get_frame_buffer(); let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers.write_set_reset(color); vga.graphics_controller_registers.write_set_reset(color);
vga.graphics_controller_registers vga.graphics_controller_registers
@ -115,7 +115,7 @@ impl Graphics640x480x16 {
.set_write_mode(WriteMode::Mode0); .set_write_mode(WriteMode::Mode0);
} }
fn set_write_mode_2(&self) { fn set_write_mode_2(self) {
let (mut vga, _frame_buffer) = self.get_frame_buffer(); let (mut vga, _frame_buffer) = self.get_frame_buffer();
vga.graphics_controller_registers vga.graphics_controller_registers
.set_write_mode(WriteMode::Mode2); .set_write_mode(WriteMode::Mode2);
@ -127,14 +127,14 @@ impl Graphics640x480x16 {
/// 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.
fn get_frame_buffer(&self) -> (SpinlockGuard<Vga>, *mut u8) { fn get_frame_buffer(self) -> (SpinlockGuard<Vga>, *mut u8) {
let mut vga = VGA.lock(); let mut vga = VGA.lock();
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] #[inline]
fn _set_pixel(&self, x: usize, y: usize, color: Color16) { fn _set_pixel(self, x: usize, y: usize, color: Color16) {
let (mut vga, frame_buffer) = self.get_frame_buffer(); let (mut vga, frame_buffer) = self.get_frame_buffer();
let offset = x / 8 + y * WIDTH_IN_BYTES; let offset = x / 8 + y * WIDTH_IN_BYTES;
let pixel_mask = 0x80 >> (x & 0x07); let pixel_mask = 0x80 >> (x & 0x07);