uefi: move constants into ConfigTableEntry

Author: fox0

uefi/src/table/cfg.rs

@@ -26,26 +26,53 @@ pub struct ConfigTableEntry {
     /// Whether this is a physical or virtual address depends on the table.
     pub address: *const c_void,
 }
-/// Entry pointing to the old ACPI 1 RSDP.
-pub const ACPI_GUID: Guid = guid!("eb9d2d30-2d88-11d3-9a16-0090273fc14d");
 
-///Entry pointing to the ACPI 2 RSDP.
-pub const ACPI2_GUID: Guid = guid!("8868e871-e4f1-11d3-bc22-0080c73c8881");
+impl ConfigTableEntry {
+    /// Entry pointing to the old ACPI 1 RSDP.
+    pub const ACPI_GUID: Guid = guid!("eb9d2d30-2d88-11d3-9a16-0090273fc14d");
 
-/// Entry pointing to the SMBIOS 1.0 table.
-pub const SMBIOS_GUID: Guid = guid!("eb9d2d31-2d88-11d3-9a16-0090273fc14d");
+    /// Entry pointing to the ACPI 2 RSDP.
+    pub const ACPI2_GUID: Guid = guid!("8868e871-e4f1-11d3-bc22-0080c73c8881");
 
-/// Entry pointing to the SMBIOS 3.0 table.
-pub const SMBIOS3_GUID: Guid = guid!("f2fd1544-9794-4a2c-992e-e5bbcf20e394");
+    /// Entry pointing to the SMBIOS 1.0 table.
+    pub const SMBIOS_GUID: Guid = guid!("eb9d2d31-2d88-11d3-9a16-0090273fc14d");
 
-/// Entry pointing to the EFI System Resource table (ESRT).
-pub const ESRT_GUID: Guid = guid!("b122a263-3661-4f68-9929-78f8b0d62180");
+    /// Entry pointing to the SMBIOS 3.0 table.
+    pub const SMBIOS3_GUID: Guid = guid!("f2fd1544-9794-4a2c-992e-e5bbcf20e394");
 
-/// GUID of the UEFI properties table.
-///
-/// The properties table is used to provide additional info
-/// about the UEFI implementation.
-pub const PROPERTIES_TABLE_GUID: Guid = guid!("880aaca3-4adc-4a04-9079-b747340825e5");
+    /// Entry pointing to the EFI System Resource table (ESRT).
+    pub const ESRT_GUID: Guid = guid!("b122a263-3661-4f68-9929-78f8b0d62180");
+
+    /// Hand-off Blocks are used to pass data from the early pre-UEFI environment to the UEFI drivers.
+    ///
+    /// Most OS loaders or applications should not mess with this.
+    pub const HAND_OFF_BLOCK_LIST_GUID: Guid = guid!("7739f24c-93d7-11d4-9a3a-0090273fc14d");
+
+    /// Table used in the early boot environment to record memory ranges.
+    pub const MEMORY_TYPE_INFORMATION_GUID: Guid = guid!("4c19049f-4137-4dd3-9c10-8b97a83ffdfa");
+
+    /// Used to identify Hand-off Blocks which store
+    /// status codes reported during the pre-UEFI environment.
+    pub const MEMORY_STATUS_CODE_RECORD_GUID: Guid = guid!("060cc026-4c0d-4dda-8f41-595fef00a502");
+
+    /// Table which provides Driver eXecution Environment services.
+    pub const DXE_SERVICES_GUID: Guid = guid!("05ad34ba-6f02-4214-952e-4da0398e2bb9");
+
+    /// LZMA-compressed filesystem.
+    pub const LZMA_COMPRESS_GUID: Guid = guid!("ee4e5898-3914-4259-9d6e-dc7bd79403cf");
+
+    /// A custom compressed filesystem used by the Tiano UEFI implementation.
+    pub const TIANO_COMPRESS_GUID: Guid = guid!("a31280ad-481e-41b6-95e8-127f4c984779");
+
+    /// Pointer to the debug image info table.
+    pub const DEBUG_IMAGE_INFO_GUID: Guid = guid!("49152e77-1ada-4764-b7a2-7afefed95e8b");
+
+    /// GUID of the UEFI properties table.
+    ///
+    /// The properties table is used to provide additional info
+    /// about the UEFI implementation.
+    pub const PROPERTIES_TABLE_GUID: Guid = guid!("880aaca3-4adc-4a04-9079-b747340825e5");
+}
 
 /// This table contains additional information about the UEFI implementation.
 #[repr(C)]
@@ -73,27 +100,3 @@ bitflags! {
         const NON_EXECUTABLE_DATA = 1;
     }
 }
-
-/// Hand-off Blocks are used to pass data from the early pre-UEFI environment to the UEFI drivers.
-///
-/// Most OS loaders or applications should not mess with this.
-pub const HAND_OFF_BLOCK_LIST_GUID: Guid = guid!("7739f24c-93d7-11d4-9a3a-0090273fc14d");
-
-/// Table used in the early boot environment to record memory ranges.
-pub const MEMORY_TYPE_INFORMATION_GUID: Guid = guid!("4c19049f-4137-4dd3-9c10-8b97a83ffdfa");
-
-/// Used to identify Hand-off Blocks which store
-/// status codes reported during the pre-UEFI environment.
-pub const MEMORY_STATUS_CODE_RECORD_GUID: Guid = guid!("060cc026-4c0d-4dda-8f41-595fef00a502");
-
-/// Table which provides Driver eXecution Environment services.
-pub const DXE_SERVICES_GUID: Guid = guid!("05ad34ba-6f02-4214-952e-4da0398e2bb9");
-
-/// LZMA-compressed filesystem.
-pub const LZMA_COMPRESS_GUID: Guid = guid!("ee4e5898-3914-4259-9d6e-dc7bd79403cf");
-
-/// A custom compressed filesystem used by the Tiano UEFI implementation.
-pub const TIANO_COMPRESS_GUID: Guid = guid!("a31280ad-481e-41b6-95e8-127f4c984779");
-
-/// Pointer to the debug image info table.
-pub const DEBUG_IMAGE_INFO_GUID: Guid = guid!("49152e77-1ada-4764-b7a2-7afefed95e8b");