Use TagType everywhere

Author: phip1611

src/boot_loader_name.rs

@@ -1,11 +1,13 @@
+use crate::TagType;
+
 /// This Tag contains the name of the bootloader that is booting the kernel.
 ///
 /// The name is a normal C-style UTF-8 zero-terminated string that can be
 /// obtained via the `name` method.
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)] // only repr(C) would add unwanted padding before first_section
 pub struct BootLoaderNameTag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     string: u8,
 }

src/command_line.rs

@@ -1,11 +1,13 @@
+use crate::TagType;
+
 /// This Tag contains the command line string.
 ///
 /// The string is a normal C-style UTF-8 zero-terminated string that can be
 /// obtained via the `command_line` method.
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)] // only repr(C) would add unwanted padding before first_section
 pub struct CommandLineTag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     string: u8,
 }

src/memory_map.rs

@@ -1,4 +1,5 @@
 use core::marker::PhantomData;
+use crate::TagType;
 
 /// This Tag provides an initial host memory map.
 ///
@@ -13,7 +14,7 @@ use core::marker::PhantomData;
 #[derive(Debug)]
 #[repr(C)]
 pub struct MemoryMapTag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     entry_size: u32,
     entry_version: u32,
@@ -45,6 +46,7 @@ impl MemoryMapTag {
 pub struct MemoryArea {
     base_addr: u64,
     length: u64,
+    // TODO see spec
     typ: u32,
     _reserved: u32,
 }
@@ -122,7 +124,7 @@ impl<'a> Iterator for MemoryAreaIter<'a> {
 #[derive(Debug)]
 #[repr(C)]
 pub struct EFIMemoryMapTag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     desc_size: u32,
     desc_version: u32,

src/module.rs

@@ -6,7 +6,7 @@ use core::fmt::{Debug, Formatter};
 #[derive(Clone, Copy)]
 #[repr(C, packed)] // only repr(C) would add unwanted padding near name_byte.
 pub struct ModuleTag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     mod_start: u32,
     mod_end: u32,

src/rsdp.rs

@@ -5,17 +5,17 @@
 //!
 //! Even though the bootloader should give the address of the real RSDP/XSDT, the checksum and
 //! signature should be manually verified.
-
 use core::slice;
 use core::str;
+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: u32,
+    typ: TagType,
     size: u32,
     pointer: u32,
 }
@@ -31,7 +31,7 @@ impl EFISdt32 {
 #[derive(Clone, Copy, Debug)]
 #[repr(C)]
 pub struct EFISdt64 {
-    typ: u32,
+    typ: TagType,
     size: u32,
     pointer: u64,
 }
@@ -47,7 +47,7 @@ impl EFISdt64 {
 #[derive(Debug)]
 #[repr(C)]
 pub struct EFIImageHandle32 {
-    typ: u32,
+    typ: TagType,
     size: u32,
     pointer: u32,
 }
@@ -56,7 +56,7 @@ pub struct EFIImageHandle32 {
 #[derive(Debug)]
 #[repr(C)]
 pub struct EFIImageHandle64 {
-    typ: u32,
+    typ: TagType,
     size: u32,
     pointer: u64,
 }
@@ -66,7 +66,7 @@ pub struct EFIImageHandle64 {
 #[derive(Debug)]
 #[repr(C)]
 pub struct ImageLoadPhysAddr {
-    typ: u32,
+    typ: TagType,
     size: u32,
     load_base_addr: u32,
 }
@@ -75,7 +75,7 @@ pub struct ImageLoadPhysAddr {
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)]
 pub struct RsdpV1Tag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     signature: [u8; 8],
     checksum: u8,
@@ -122,7 +122,7 @@ impl RsdpV1Tag {
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)]
 pub struct RsdpV2Tag {
-    typ: u32,
+    typ: TagType,
     size: u32,
     signature: [u8; 8],
     checksum: u8,

src/vbe_info.rs

@@ -1,11 +1,12 @@
 use core::fmt;
+use crate::TagType;
 
 /// This tag contains VBE metadata, VBE controller information returned by the
 /// VBE Function 00h and VBE mode information returned by the VBE Function 01h.
 #[derive(Debug, Copy, Clone)]
 #[repr(C, packed)]
 pub struct VBEInfoTag {
-    typ: u32,
+    typ: TagType,
     length: u32,
 
     /// Indicates current video mode in the format specified in VBE 3.0.