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 {
158
158
#[ repr( C ) ]
159
159
pub struct FrameBuffer {
160
160
pub ( crate ) buffer_start : u64 ,
161
- pub ( crate ) buffer_byte_len : usize ,
162
161
pub ( crate ) info : FrameBufferInfo ,
163
162
}
164
163
165
164
impl 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 }
172
167
}
173
168
174
169
/// Returns the raw bytes of the framebuffer as slice.
@@ -182,11 +177,11 @@ impl FrameBuffer {
182
177
}
183
178
184
179
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 ) }
186
181
}
187
182
188
183
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 ) }
190
185
}
191
186
192
187
/// Returns layout and pixel format information of the framebuffer.
Original file line number Diff line number Diff line change @@ -440,13 +440,7 @@ where
440
440
let mut info = BootInfo :: new ( memory_regions. into ( ) ) ;
441
441
info. framebuffer = mappings
442
442
. 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 ) )
450
444
. into ( ) ;
451
445
info. physical_memory_offset = mappings. physical_memory_offset . map ( VirtAddr :: as_u64) . into ( ) ;
452
446
info. recursive_index = mappings. recursive_index . map ( Into :: into) . into ( ) ;
You can’t perform that action at this time.
0 commit comments