acpi: remove AccessSize enum

For certain address spaces, like the PCC (Platform Communications
Channel), all access size values in a GAS (Generic Address Structure)
are valid. Therefore, while this might make sense for other address
spaces (like system memory), we cannot keep the enum with a subset of
valid values.

Author: 00xc

acpi/src/address.rs

@@ -2,7 +2,6 @@
 //! in a wide range of address spaces.
 
 use crate::AcpiError;
-use core::convert::TryFrom;
 
 /// This is the raw form of a Generic Address Structure, and follows the layout found in the ACPI tables. It does
 /// not form part of the public API, and should be turned into a `GenericAddress` for most use-cases.
@@ -51,36 +50,12 @@ pub enum AddressSpace {
     OemDefined(u8),
 }
 
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub enum AccessSize {
-    Undefined,
-    ByteAccess,
-    WordAccess,
-    DWordAccess,
-    QWordAccess,
-}
-
-impl TryFrom<u8> for AccessSize {
-    type Error = AcpiError;
-
-    fn try_from(size: u8) -> Result<Self, Self::Error> {
-        match size {
-            0 => Ok(AccessSize::Undefined),
-            1 => Ok(AccessSize::ByteAccess),
-            2 => Ok(AccessSize::WordAccess),
-            3 => Ok(AccessSize::DWordAccess),
-            4 => Ok(AccessSize::QWordAccess),
-            _ => Err(AcpiError::InvalidGenericAddress),
-        }
-    }
-}
-
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub struct GenericAddress {
     pub address_space: AddressSpace,
     pub bit_width: u8,
     pub bit_offset: u8,
-    pub access_size: AccessSize,
+    pub access_size: u8,
     pub address: u64,
 }
 
@@ -108,7 +83,7 @@ impl GenericAddress {
             address_space,
             bit_width: raw.bit_width,
             bit_offset: raw.bit_offset,
-            access_size: AccessSize::try_from(raw.access_size)?,
+            access_size: raw.access_size,
             address: raw.address,
         })
     }

acpi/src/fadt.rs

@@ -1,5 +1,5 @@
 use crate::{
-    address::{AccessSize, AddressSpace, GenericAddress, RawGenericAddress},
+    address::{AddressSpace, GenericAddress, RawGenericAddress},
     sdt::{ExtendedField, SdtHeader, Signature},
     AcpiError,
     AcpiTable,
@@ -179,7 +179,7 @@ impl Fadt {
             address_space: AddressSpace::SystemIo,
             bit_width: self.pm1_event_length * 8,
             bit_offset: 0,
-            access_size: AccessSize::Undefined,
+            access_size: 0,
             address: self.pm1a_event_block.into(),
         })
     }
@@ -196,7 +196,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: self.pm1_event_length * 8,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.pm1b_event_block.into(),
             }))
         } else {
@@ -215,7 +215,7 @@ impl Fadt {
             address_space: AddressSpace::SystemIo,
             bit_width: self.pm1_control_length * 8,
             bit_offset: 0,
-            access_size: AccessSize::Undefined,
+            access_size: 0,
             address: self.pm1a_control_block.into(),
         })
     }
@@ -232,7 +232,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: self.pm1_control_length * 8,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.pm1b_control_block.into(),
             }))
         } else {
@@ -252,7 +252,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: self.pm2_control_length * 8,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.pm2_control_block.into(),
             }))
         } else {
@@ -279,7 +279,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: 32,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.pm_timer_block.into(),
             }))
         } else {
@@ -299,7 +299,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: self.gpe0_block_length * 8,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.gpe0_block.into(),
             }))
         } else {
@@ -319,7 +319,7 @@ impl Fadt {
                 address_space: AddressSpace::SystemIo,
                 bit_width: self.gpe1_block_length * 8,
                 bit_offset: 0,
-                access_size: AccessSize::Undefined,
+                access_size: 0,
                 address: self.gpe1_block.into(),
             }))
         } else {