Rename struct

Author: phil-opp

bios/common/src/lib.rs

@@ -7,15 +7,15 @@ pub mod racy_cell;
 pub struct BiosInfo {
     pub stage_4: Region,
     pub kernel: Region,
-    pub framebuffer: FramebufferInfo,
+    pub framebuffer: BiosFramebufferInfo,
     pub memory_map_addr: u32,
     pub memory_map_len: u16,
 }
 
 #[cfg_attr(feature = "debug", derive(Debug))]
 #[derive(Clone, Copy)]
 #[repr(C)]
-pub struct FramebufferInfo {
+pub struct BiosFramebufferInfo {
     pub region: Region,
     pub width: u16,
     pub height: u16,

bios/stage-2/src/main.rs

@@ -7,7 +7,7 @@ use crate::{
         copy_to_protected_mode, enter_protected_mode_and_jump_to_stage_3, enter_unreal_mode,
     },
 };
-use bootloader_x86_64_bios_common::{BiosInfo, FramebufferInfo, Region};
+use bootloader_x86_64_bios_common::{BiosFramebufferInfo, BiosInfo, Region};
 use byteorder::{ByteOrder, LittleEndian};
 use core::{fmt::Write as _, slice};
 use disk::AlignedArrayBuffer;
@@ -130,7 +130,7 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
         },
         memory_map_addr: memory_map.as_mut_ptr() as u32,
         memory_map_len: memory_map.len().try_into().unwrap(),
-        framebuffer: FramebufferInfo {
+        framebuffer: BiosFramebufferInfo {
             region: Region {
                 start: vesa_mode.framebuffer_start.into(),
                 len: u64::from(vesa_mode.height) * u64::from(vesa_mode.bytes_per_scanline),

bios/stage-3/src/screen.rs

@@ -1,8 +1,5 @@
-use bootloader_x86_64_bios_common::{racy_cell::RacyCell, FramebufferInfo, PixelFormat};
-use core::{
-    fmt::{self, Write},
-    ptr,
-};
+use bootloader_x86_64_bios_common::{racy_cell::RacyCell, BiosFramebufferInfo, PixelFormat};
+use core::{fmt, ptr};
 use noto_sans_mono_bitmap::{get_bitmap, get_bitmap_width, BitmapChar, BitmapHeight, FontWeight};
 
 static WRITER: RacyCell<Option<ScreenWriter>> = RacyCell::new(None);
@@ -15,7 +12,7 @@ impl fmt::Write for Writer {
     }
 }
 
-pub fn init(info: FramebufferInfo) {
+pub fn init(info: BiosFramebufferInfo) {
     let framebuffer = unsafe {
         core::slice::from_raw_parts_mut(
             info.region.start as *mut u8,
@@ -33,13 +30,13 @@ const LOG_SPACING: usize = 2;
 
 struct ScreenWriter {
     framebuffer: &'static mut [u8],
-    info: FramebufferInfo,
+    info: BiosFramebufferInfo,
     x_pos: usize,
     y_pos: usize,
 }
 
 impl ScreenWriter {
-    pub fn new(framebuffer: &'static mut [u8], info: FramebufferInfo) -> Self {
+    pub fn new(framebuffer: &'static mut [u8], info: BiosFramebufferInfo) -> Self {
         let mut logger = Self {
             framebuffer,
             info,