|
@@ -12,7 +12,7 @@ use core::mem::size_of;
|
|
|
|
|
|
/// EFI system table in 32 bit mode tag.
|
|
/// EFI system table in 32 bit mode tag.
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
-#[repr(C)]
|
|
|
|
|
|
+#[repr(C, align(8))]
|
|
pub struct EFISdt32Tag {
|
|
pub struct EFISdt32Tag {
|
|
header: TagHeader,
|
|
header: TagHeader,
|
|
pointer: u32,
|
|
pointer: u32,
|
|
@@ -43,7 +43,7 @@ impl TagTrait for EFISdt32Tag {
|
|
|
|
|
|
/// EFI system table in 64 bit mode tag.
|
|
/// EFI system table in 64 bit mode tag.
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
-#[repr(C)]
|
|
|
|
|
|
+#[repr(C, align(8))]
|
|
pub struct EFISdt64Tag {
|
|
pub struct EFISdt64Tag {
|
|
header: TagHeader,
|
|
header: TagHeader,
|
|
pointer: u64,
|
|
pointer: u64,
|
|
@@ -75,7 +75,7 @@ impl TagTrait for EFISdt64Tag {
|
|
/// Tag that contains the pointer to the boot loader's UEFI image handle
|
|
/// Tag that contains the pointer to the boot loader's UEFI image handle
|
|
/// (32-bit).
|
|
/// (32-bit).
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
-#[repr(C)]
|
|
|
|
|
|
+#[repr(C, align(8))]
|
|
pub struct EFIImageHandle32Tag {
|
|
pub struct EFIImageHandle32Tag {
|
|
header: TagHeader,
|
|
header: TagHeader,
|
|
pointer: u32,
|
|
pointer: u32,
|
|
@@ -108,7 +108,7 @@ impl TagTrait for EFIImageHandle32Tag {
|
|
/// Tag that contains the pointer to the boot loader's UEFI image handle
|
|
/// Tag that contains the pointer to the boot loader's UEFI image handle
|
|
/// (64-bit).
|
|
/// (64-bit).
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
-#[repr(C)]
|
|
|
|
|
|
+#[repr(C, align(8))]
|
|
pub struct EFIImageHandle64Tag {
|
|
pub struct EFIImageHandle64Tag {
|
|
header: TagHeader,
|
|
header: TagHeader,
|
|
pointer: u64,
|
|
pointer: u64,
|
|
@@ -138,9 +138,10 @@ impl TagTrait for EFIImageHandle64Tag {
|
|
fn dst_len(_: &TagHeader) {}
|
|
fn dst_len(_: &TagHeader) {}
|
|
}
|
|
}
|
|
|
|
|
|
-/// EFI ExitBootServices was not called tag.
|
|
|
|
|
|
+/// EFI ExitBootServices was not called tag. This tag has no payload and is
|
|
|
|
+/// just a marker.
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
-#[repr(C)]
|
|
|
|
|
|
+#[repr(C, align(8))]
|
|
pub struct EFIBootServicesNotExitedTag {
|
|
pub struct EFIBootServicesNotExitedTag {
|
|
header: TagHeader,
|
|
header: TagHeader,
|
|
}
|
|
}
|