File tree Expand file tree Collapse file tree 2 files changed +5
-16
lines changed Expand file tree Collapse file tree 2 files changed +5
-16
lines changed Original file line number Diff line number Diff line change @@ -158,17 +158,12 @@ pub enum MemoryRegionKind {
158158#[ repr( C ) ]
159159pub struct FrameBuffer {
160160 pub ( crate ) buffer_start : u64 ,
161- pub ( crate ) buffer_byte_len : usize ,
162161 pub ( crate ) info : FrameBufferInfo ,
163162}
164163
165164impl FrameBuffer {
166- pub fn new ( buffer_start : u64 , buffer_byte_len : usize , info : FrameBufferInfo ) -> Self {
167- Self {
168- buffer_start,
169- buffer_byte_len,
170- info,
171- }
165+ pub fn new ( buffer_start : u64 , info : FrameBufferInfo ) -> Self {
166+ Self { buffer_start, info }
172167 }
173168
174169 /// Returns the raw bytes of the framebuffer as slice.
@@ -182,11 +177,11 @@ impl FrameBuffer {
182177 }
183178
184179 unsafe fn create_buffer < ' a > ( & self ) -> & ' a [ u8 ] {
185- unsafe { slice:: from_raw_parts ( self . buffer_start as * const u8 , self . buffer_byte_len ) }
180+ unsafe { slice:: from_raw_parts ( self . buffer_start as * const u8 , self . info . byte_len ) }
186181 }
187182
188183 unsafe fn create_buffer_mut < ' a > ( & self ) -> & ' a mut [ u8 ] {
189- unsafe { slice:: from_raw_parts_mut ( self . buffer_start as * mut u8 , self . buffer_byte_len ) }
184+ unsafe { slice:: from_raw_parts_mut ( self . buffer_start as * mut u8 , self . info . byte_len ) }
190185 }
191186
192187 /// Returns layout and pixel format information of the framebuffer.
Original file line number Diff line number Diff line change @@ -440,13 +440,7 @@ where
440440 let mut info = BootInfo :: new ( memory_regions. into ( ) ) ;
441441 info. framebuffer = mappings
442442 . framebuffer
443- . map ( |addr| {
444- FrameBuffer :: new (
445- addr. as_u64 ( ) ,
446- system_info. framebuffer_info . byte_len ,
447- system_info. framebuffer_info ,
448- )
449- } )
443+ . map ( |addr| FrameBuffer :: new ( addr. as_u64 ( ) , system_info. framebuffer_info ) )
450444 . into ( ) ;
451445 info. physical_memory_offset = mappings. physical_memory_offset . map ( VirtAddr :: as_u64) . into ( ) ;
452446 info. recursive_index = mappings. recursive_index . map ( Into :: into) . into ( ) ;
You can’t perform that action at this time.
0 commit comments