dedicated module file for EFI-related MBI tags

src/efi.rs

@@ -0,0 +1,53 @@
+//! All MBI tags related to (U)EFI.
+
+use crate::TagType;
+
+/// EFI system table in 32 bit mode
+#[derive(Clone, Copy, Debug)]
+#[repr(C, packed)] // only repr(C) would add unwanted padding before first_section
+pub struct EFISdt32 {
+    typ: TagType,
+    size: u32,
+    pointer: u32,
+}
+
+impl EFISdt32 {
+    /// The Physical address of a i386 EFI system table.
+    pub fn sdt_address(&self) -> usize {
+        self.pointer as usize
+    }
+}
+
+/// EFI system table in 64 bit mode
+#[derive(Clone, Copy, Debug)]
+#[repr(C)]
+pub struct EFISdt64 {
+    typ: TagType,
+    size: u32,
+    pointer: u64,
+}
+
+impl EFISdt64 {
+    /// The Physical address of a x86_64 EFI system table.
+    pub fn sdt_address(&self) -> usize {
+        self.pointer as usize
+    }
+}
+
+/// Contains pointer to boot loader image handle.
+#[derive(Debug)]
+#[repr(C)]
+pub struct EFIImageHandle32 {
+    typ: TagType,
+    size: u32,
+    pointer: u32,
+}
+
+/// Contains pointer to boot loader image handle.
+#[derive(Debug)]
+#[repr(C)]
+pub struct EFIImageHandle64 {
+    typ: TagType,
+    size: u32,
+    pointer: u64,
+}

src/lib.rs

@@ -39,8 +39,9 @@ pub use memory_map::{
 };
 pub use module::{ModuleIter, ModuleTag};
 pub use rsdp::{
-    EFIImageHandle32, EFIImageHandle64, EFISdt32, EFISdt64, ImageLoadPhysAddr, RsdpV1Tag, RsdpV2Tag,
+    ImageLoadPhysAddr, RsdpV1Tag, RsdpV2Tag,
 };
+pub use efi::{EFIImageHandle32, EFIImageHandle64, EFISdt32, EFISdt64};
 pub use vbe_info::{
     VBECapabilities, VBEControlInfo, VBEDirectColorAttributes, VBEField, VBEInfoTag,
     VBEMemoryModel, VBEModeAttributes, VBEModeInfo, VBEWindowAttributes,
@@ -58,6 +59,7 @@ mod memory_map;
 mod module;
 mod rsdp;
 mod vbe_info;
+mod efi;
 
 /// Load the multiboot boot information struct from an address.
 ///

src/rsdp.rs

@@ -1,3 +1,6 @@
+//! Module for RSDP/ACPI. RSDP (Root System Description Pointer) is a data structure used in the
+//! ACPI programming interface.
+//!
 //! The tag that the bootloader passes will depend on the ACPI version the hardware supports.
 //! For ACPI Version 1.0, a `RsdpV1Tag` will be provided, which can be accessed from
 //! `BootInformation` using the `rsdp_v1_tag` function. For subsequent versions of ACPI, a
@@ -11,56 +14,6 @@ use crate::TagType;
 
 const RSDPV1_LENGTH: usize = 20;
 
-/// EFI system table in 32 bit mode
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)] // only repr(C) would add unwanted padding before first_section
-pub struct EFISdt32 {
-    typ: TagType,
-    size: u32,
-    pointer: u32,
-}
-
-impl EFISdt32 {
-    /// The Physical address of a i386 EFI system table.
-    pub fn sdt_address(&self) -> usize {
-        self.pointer as usize
-    }
-}
-
-/// EFI system table in 64 bit mode
-#[derive(Clone, Copy, Debug)]
-#[repr(C)]
-pub struct EFISdt64 {
-    typ: TagType,
-    size: u32,
-    pointer: u64,
-}
-
-impl EFISdt64 {
-    /// The Physical address of a x86_64 EFI system table.
-    pub fn sdt_address(&self) -> usize {
-        self.pointer as usize
-    }
-}
-
-/// Contains pointer to boot loader image handle.
-#[derive(Debug)]
-#[repr(C)]
-pub struct EFIImageHandle32 {
-    typ: TagType,
-    size: u32,
-    pointer: u32,
-}
-
-/// Contains pointer to boot loader image handle.
-#[derive(Debug)]
-#[repr(C)]
-pub struct EFIImageHandle64 {
-    typ: TagType,
-    size: u32,
-    pointer: u64,
-}
-
 /// If the image has relocatable header tag, this tag contains the image's
 /// base physical address.
 #[derive(Debug)]