kernel: update the limine crate

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/Cargo.lock

@@ -48,15 +48,15 @@ use limine::*;
 
 use self::interrupts::INTERRUPT_CONTROLLER;
 
-static MEMMAP: LimineMemmapRequest = LimineMemmapRequest::new(0);
-static SMP: LimineSmpRequest = LimineSmpRequest::new(0);
-static KERNEL_FILE: LimineKernelFileRequest = LimineKernelFileRequest::new(0);
-static MODULES: LimineModuleRequest = LimineModuleRequest::new(0);
-static FRAMEBUFFER: LimineFramebufferRequest = LimineFramebufferRequest::new(0);
-static RSDP: LimineRsdpRequest = LimineRsdpRequest::new(0);
-static BOOT_TIME: LimineBootTimeRequest = LimineBootTimeRequest::new(0);
-static STACK: LimineStackSizeRequest = LimineStackSizeRequest::new(0).stack_size(0x1000 * 32); // 16KiB of stack for both the BSP and the APs
-static HHDM: LimineHhdmRequest = LimineHhdmRequest::new(0);
+static MEMMAP: MemmapRequest = MemmapRequest::new(0);
+static SMP: SmpRequest = SmpRequest::new(0);
+static KERNEL_FILE: KernelFileRequest = KernelFileRequest::new(0);
+static MODULES: ModuleRequest = ModuleRequest::new(0);
+static FRAMEBUFFER: FramebufferRequest = FramebufferRequest::new(0);
+static RSDP: RsdpRequest = RsdpRequest::new(0);
+static BOOT_TIME: BootTimeRequest = BootTimeRequest::new(0);
+static STACK: StackSizeRequest = StackSizeRequest::new(0).stack_size(0x1000 * 32); // 16KiB of stack for both the BSP and the APs
+static HHDM: HhdmRequest = HhdmRequest::new(0);
 
 #[no_mangle]
 extern "C" fn arch_aero_main() -> ! {
@@ -203,7 +203,7 @@ extern "C" fn arch_aero_main() -> ! {
 }
 
 #[no_mangle]
-extern "C" fn x86_64_aero_ap_main(boot_info: *const LimineSmpInfo) -> ! {
+extern "C" fn x86_64_aero_ap_main(boot_info: *const SmpInfo) -> ! {
     let boot_info = unsafe { &*boot_info };
     let ap_id = boot_info.processor_id as usize;
 

src/aero_kernel/src/arch/x86_64/mod.rs

@@ -1,6 +1,6 @@
 use core::num::ParseIntError;
 
-use limine::{LimineFile, NonNullPtr};
+use limine::NonNullPtr;
 use spin::Once;
 
 use crate::rendy;
@@ -27,7 +27,7 @@ impl CommandLine {
     }
 }
 
-fn resolve_module(modules: &[NonNullPtr<LimineFile>], name: &str) -> &'static [u8] {
+fn resolve_module(modules: &[NonNullPtr<limine::File>], name: &str) -> &'static [u8] {
     modules
         .iter()
         .find(|m| {
@@ -55,7 +55,7 @@ fn parse_number(mut string: &str) -> Result<usize, ParseIntError> {
     }
 }
 
-pub fn parse(cmdline: &'static str, modules: &[NonNullPtr<LimineFile>]) -> CommandLine {
+pub fn parse(cmdline: &'static str, modules: &[NonNullPtr<limine::File>]) -> CommandLine {
     RAW_CMDLINE_STR.call_once(|| cmdline);
 
     // Chew up the leading spaces.

src/aero_kernel/src/cmdline.rs

@@ -22,7 +22,7 @@ use core::ptr::NonNull;
 use core::sync::atomic::{AtomicUsize, Ordering};
 
 use alloc::vec::Vec;
-use limine::{LimineMemmapEntry, LimineMemoryMapEntryType, NonNullPtr};
+use limine::{MemmapEntry, MemoryMapEntryType, NonNullPtr};
 use spin::Once;
 
 use super::mapper::*;
@@ -74,7 +74,7 @@ impl LockedFrameAllocator {
     }
 
     /// Initializes the inner locked global frame allocator.
-    pub(super) fn init(&self, memory_map: &mut [NonNullPtr<LimineMemmapEntry>]) {
+    pub(super) fn init(&self, memory_map: &mut [NonNullPtr<MemmapEntry>]) {
         self.0
             .call_once(|| Mutex::new(GlobalFrameAllocator::new(memory_map)));
     }
@@ -129,7 +129,7 @@ unsafe impl FrameAllocator<Size2MiB> for LockedFrameAllocator {
 }
 
 struct RangeMemoryIter<'a> {
-    iter: core::slice::Iter<'a, NonNullPtr<LimineMemmapEntry>>,
+    iter: core::slice::Iter<'a, NonNullPtr<MemmapEntry>>,
 
     cursor_base: PhysAddr,
     cursor_end: PhysAddr,
@@ -145,7 +145,7 @@ impl<'a> Iterator for RangeMemoryIter<'a> {
                 // the memory map and set the cursor to the start of it.
                 let next = self.iter.next()?;
 
-                if next.typ == LimineMemoryMapEntryType::Usable {
+                if next.typ == MemoryMapEntryType::Usable {
                     break Some(next);
                 }
             } {
@@ -290,7 +290,7 @@ pub struct GlobalFrameAllocator {
 }
 
 impl GlobalFrameAllocator {
-    fn new(memory_map: &mut [NonNullPtr<LimineMemmapEntry>]) -> Self {
+    fn new(memory_map: &mut [NonNullPtr<MemmapEntry>]) -> Self {
         // Find a memory map entry that is big enough to fit all of the items in
         // range memory iter.
         let requested_size = (core::mem::size_of::<MemoryRange>() * memory_map.len()) as u64;
@@ -300,7 +300,7 @@ impl GlobalFrameAllocator {
             let entry = &mut memory_map[i];
 
             // Make sure that the memory map entry is marked as usable.
-            if entry.typ != LimineMemoryMapEntryType::Usable {
+            if entry.typ != MemoryMapEntryType::Usable {
                 continue;
             }
 

src/aero_kernel/src/mem/paging/frame.rs

@@ -30,7 +30,7 @@ pub use self::mapper::*;
 pub use self::page::*;
 pub use self::page_table::*;
 
-use limine::LimineMemmapEntry;
+use limine::MemmapEntry;
 use limine::NonNullPtr;
 
 pub use frame::LockedFrameAllocator;
@@ -81,7 +81,7 @@ pub const fn level_5_paging_enabled() -> bool {
 
 /// Initialize paging.
 pub fn init(
-    memory_regions: &mut [NonNullPtr<LimineMemmapEntry>],
+    memory_regions: &mut [NonNullPtr<MemmapEntry>],
 ) -> Result<OffsetPageTable<'static>, MapToError<Size4KiB>> {
     let active_level_4 = unsafe { active_level_4_table() };
     let offset_table = unsafe { OffsetPageTable::new(active_level_4, PHYSICAL_MEMORY_OFFSET) };

src/aero_kernel/src/mem/paging/mod.rs

@@ -24,7 +24,7 @@ use core::u8;
 
 use alloc::boxed::Box;
 
-use limine::LimineFramebuffer;
+use limine::Framebuffer;
 use spin::Once;
 
 use crate::cmdline::CommandLine;
@@ -823,8 +823,8 @@ pub fn reset_default() {
     set_text_color(DEFAULT_TEXT_FOREGROUND, DEFAULT_TEXT_BACKGROUND)
 }
 
-/// Returns the terminal's resolution in the form of a `(horizontal_resolution, vertical_resolution)`
-/// tuple.
+/// Returns the terminal's resolution in the form of a `(horizontal_resolution,
+/// vertical_resolution)` tuple.
 ///
 /// # Panics
 /// This function was called before the terminal was initialized.
@@ -936,7 +936,7 @@ pub unsafe fn force_unlock() {
     DEBUG_RENDY.get().map(|l| l.force_unlock());
 }
 
-pub fn init(framebuffer_tag: &LimineFramebuffer, cmdline: &CommandLine) {
+pub fn init(framebuffer_tag: &Framebuffer, cmdline: &CommandLine) {
     let framebuffer_info = RendyInfo {
         byte_len: framebuffer_tag.size(),
         bits_per_pixel: framebuffer_tag.bpp as usize,