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:37:42 -04:00
parent 66b4ccf6d0
commit 6bc387cdf6
2 changed files with 2 additions and 2 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<'static, 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)

2
src/writers/graphics_640x480x16.rs
View file

@ -127,7 +127,7 @@ 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<'static, 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)