more ergonomic enum

acpi/src/interrupt.rs

@@ -48,6 +48,20 @@ pub struct NmiSource {
     pub trigger_mode: TriggerMode,
 }
 
+#[derive(Debug)]
+pub struct Apic {
+    pub local_apic_address: u64,
+    pub io_apics: Vec<IoApic>,
+    pub local_apic_nmi_line: LocalInterruptLine,
+    pub interrupt_source_overrides: Vec<InterruptSourceOverride>,
+    pub nmi_sources: Vec<NmiSource>,
+
+    /// If this field is set, you must remap and mask all the lines of the legacy PIC, even if
+    /// you choose to use the APIC. It's recommended that you do this even if ACPI does not
+    /// require you to.
+    pub also_has_legacy_pics: bool,
+}
+
 #[derive(Debug)]
 pub enum InterruptModel {
     /// This model is only chosen when a newer one can not be found and the system supports the
@@ -57,16 +71,5 @@ pub enum InterruptModel {
     /// Describes an interrupt controller based around the Advanced Programmable Interrupt
     /// Controllers. These are likely to be found on x86 and x86_64 systems and are made up of a
     /// Local APIC for each core and one or more I/O APICs to handle external interrupts.
-    Apic {
-        local_apic_address: u64,
-        io_apics: Vec<IoApic>,
-        local_apic_nmi_line: LocalInterruptLine,
-        interrupt_source_overrides: Vec<InterruptSourceOverride>,
-        nmi_sources: Vec<NmiSource>,
-
-        /// If this field is set, you must remap and mask all the lines of the legacy PIC, even if
-        /// you choose to use the APIC. It's recommended that you do this even if ACPI does not
-        /// require you to.
-        also_has_legacy_pics: bool,
-    },
+    Apic(Apic),
 }

acpi/src/madt.rs

@@ -1,5 +1,5 @@
 use crate::{
-    interrupt::{InterruptModel, InterruptSourceOverride, IoApic, NmiSource, Polarity, TriggerMode},
+    interrupt::{Apic, InterruptModel, InterruptSourceOverride, IoApic, NmiSource, Polarity, TriggerMode},
     sdt::SdtHeader,
     Acpi,
     AcpiError,
@@ -497,7 +497,7 @@ fn parse_apic_model(acpi: &mut Acpi, mapping: &PhysicalMapping<Madt>) -> Result<
         }
     }
 
-    Ok(InterruptModel::Apic {
+    Ok(InterruptModel::Apic(Apic {
         local_apic_address,
         io_apics,
         local_apic_nmi_line: local_apic_nmi_line
@@ -505,7 +505,7 @@ fn parse_apic_model(acpi: &mut Acpi, mapping: &PhysicalMapping<Madt>) -> Result<
         interrupt_source_overrides,
         nmi_sources,
         also_has_legacy_pics: (*mapping).supports_8259(),
-    })
+    }))
 }
 
 fn parse_mps_inti_flags(flags: u16) -> Result<(Polarity, TriggerMode), AcpiError> {