Skip to content

Commit

Permalink
Run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
jasoncouture committed Jan 6, 2023
1 parent 096c5c6 commit 16fd0bb
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
8 changes: 7 additions & 1 deletion bios/stage-2/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,13 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
let kernel_page_size = (((kernel_len - 1) / 4096) + 1) as usize;
let ramdisk_start = KERNEL_DST.wrapping_add(kernel_page_size * 4096);
writeln!(screen::Writer, "Loading ramdisk...").unwrap();
let ramdisk_len = match try_load_file("ramdisk", KERNEL_DST.wrapping_add(kernel_page_size * 4096), &mut fs, &mut disk, disk_buffer) {
let ramdisk_len = match try_load_file(
"ramdisk",
KERNEL_DST.wrapping_add(kernel_page_size * 4096),
&mut fs,
&mut disk,
disk_buffer,
) {
Some(s) => s,
None => 0u64,
};
Expand Down
6 changes: 5 additions & 1 deletion bios/stage-4/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ pub extern "C" fn _start(info: &mut BiosInfo) -> ! {
let kernel_size = info.kernel.len;
let next_free_frame = match info.ramdisk.len {
0 => PhysFrame::containing_address(kernel_start + kernel_size - 1u64) + 1,
_ => PhysFrame::containing_address(PhysAddr::new(info.ramdisk.start + info.ramdisk.len - 1u64)) + 1
_ => {
PhysFrame::containing_address(PhysAddr::new(
info.ramdisk.start + info.ramdisk.len - 1u64,
)) + 1
}
};
let mut frame_allocator = LegacyFrameAllocator::new_starting_at(
next_free_frame,
Expand Down
2 changes: 1 addition & 1 deletion tests/default_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bootloader_test_runner::run_test_kernel;
fn basic_boot() {
run_test_kernel(
env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"),
None
None,
);
}

Expand Down
12 changes: 10 additions & 2 deletions uefi/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
*SYSTEM_TABLE.get() = Some(st.unsafe_clone());
}
st.stdout().clear().unwrap();
writeln!(st.stdout(), "UEFI bootloader started; trying to load kernel").unwrap();
writeln!(
st.stdout(),
"UEFI bootloader started; trying to load kernel"
)
.unwrap();

let mut boot_mode = BootMode::Disk;
let mut kernel = load_kernel(image, &mut st, boot_mode);
Expand Down Expand Up @@ -439,7 +443,11 @@ fn create_page_tables(
}
}

fn init_logger(image_handle: Handle, st: &SystemTable<Boot>, config: BootloaderConfig) -> Option<RawFrameBufferInfo> {
fn init_logger(
image_handle: Handle,
st: &SystemTable<Boot>,
config: BootloaderConfig,
) -> Option<RawFrameBufferInfo> {
let gop_handle = st
.boot_services()
.get_handle_for_protocol::<GraphicsOutput>()
Expand Down

0 comments on commit 16fd0bb

Please sign in to comment.