@@ -30,7 +30,7 @@ pub mod legacy_memory_region;
30
30
pub mod level_4_entries;
31
31
/// Implements a loader for the kernel ELF binary.
32
32
pub mod load_kernel;
33
- /// Provides a logger type that logs output as text to pixel-based framebuffers.
33
+ /// Provides a logger type that logs output as text to pixel-based framebuffers.
34
34
pub mod logger;
35
35
36
36
// Contains the parsed configuration table from the kernel's Cargo.toml.
@@ -55,12 +55,12 @@ pub fn init_logger(framebuffer: &'static mut [u8], info: FrameBufferInfo) {
55
55
log:: set_max_level ( log:: LevelFilter :: Trace ) ;
56
56
}
57
57
58
- /// Required system information that should be queried from the BIOS or UEFI firmware.
58
+ /// Required system information that should be queried from the BIOS or UEFI firmware.
59
59
#[ derive( Debug , Copy , Clone ) ]
60
60
pub struct SystemInfo {
61
61
/// Start address of the pixel-based framebuffer.
62
62
pub framebuffer_addr : PhysAddr ,
63
- /// Information about the framebuffer, including layout and pixel format.
63
+ /// Information about the framebuffer, including layout and pixel format.
64
64
pub framebuffer_info : FrameBufferInfo ,
65
65
/// Address of the _Root System Description Pointer_ structure of the ACPI standard.
66
66
pub rsdp_addr : Option < PhysAddr > ,
@@ -325,11 +325,14 @@ where
325
325
version_patch : env ! ( "CARGO_PKG_VERSION_PATCH" ) . parse ( ) . unwrap ( ) ,
326
326
pre_release : !env ! ( "CARGO_PKG_VERSION_PRE" ) . is_empty ( ) ,
327
327
memory_regions : memory_regions. into ( ) ,
328
- framebuffer : mappings. framebuffer . map ( |addr| FrameBuffer {
329
- buffer_start : addr. as_u64 ( ) ,
330
- buffer_byte_len : system_info. framebuffer_info . byte_len ,
331
- info : system_info. framebuffer_info ,
332
- } ) . into ( ) ,
328
+ framebuffer : mappings
329
+ . framebuffer
330
+ . map ( |addr| FrameBuffer {
331
+ buffer_start : addr. as_u64 ( ) ,
332
+ buffer_byte_len : system_info. framebuffer_info . byte_len ,
333
+ info : system_info. framebuffer_info ,
334
+ } )
335
+ . into ( ) ,
333
336
physical_memory_offset : mappings. physical_memory_offset . map ( VirtAddr :: as_u64) . into ( ) ,
334
337
recursive_index : mappings. recursive_index . map ( Into :: into) . into ( ) ,
335
338
rsdp_addr : system_info. rsdp_addr . map ( |addr| addr. as_u64 ( ) ) . into ( ) ,
@@ -421,7 +424,7 @@ unsafe fn context_switch(
421
424
unreachable ! ( ) ;
422
425
}
423
426
424
- /// Memory addresses required for the context switch.
427
+ /// Memory addresses required for the context switch.
425
428
struct Addresses {
426
429
page_table : PhysFrame ,
427
430
stack_top : VirtAddr ,
0 commit comments