Merge pull request #870 from nicholasbishop/bishop-raw-system-table

uefi-raw: Add SystemTable

Author: phip1611

uefi-raw/src/table/header.rs

@@ -1,7 +1,7 @@
 use super::Revision;
 
 /// The common header that all UEFI tables begin with.
-#[derive(Debug)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 #[repr(C)]
 pub struct Header {
     /// Unique identifier for this table.

uefi-raw/src/table/mod.rs

@@ -6,6 +6,7 @@ mod revision;
 pub mod boot;
 pub mod configuration;
 pub mod runtime;
+pub mod system;
 
 pub use header::Header;
 pub use revision::Revision;

uefi-raw/src/table/revision.rs

@@ -30,7 +30,7 @@ use core::fmt;
 /// assert_eq!(Revision::EFI_2_31.to_string(), "2.3.1");
 /// assert_eq!(Revision::EFI_2_100.to_string(), "2.10");
 /// ```
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd)]
 #[repr(transparent)]
 pub struct Revision(pub u32);
 

uefi-raw/src/table/system.rs

@@ -0,0 +1,70 @@
+use crate::protocol::console::{SimpleTextInputProtocol, SimpleTextOutputProtocol};
+use crate::table::boot::BootServices;
+use crate::table::configuration::ConfigurationTable;
+use crate::table::runtime::RuntimeServices;
+use crate::table::Header;
+use crate::{Char16, Handle};
+use core::{mem, ptr};
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[repr(C)]
+pub struct SystemTable {
+    pub header: Header,
+
+    pub firmware_vendor: *const Char16,
+    pub firmware_revision: u32,
+
+    pub stdin_handle: Handle,
+    pub stdin: *mut SimpleTextInputProtocol,
+
+    pub stdout_handle: Handle,
+    pub stdout: *mut SimpleTextOutputProtocol,
+
+    pub stderr_handle: Handle,
+    pub stderr: *mut SimpleTextOutputProtocol,
+
+    pub runtime_services: *mut RuntimeServices,
+    pub boot_services: *mut BootServices,
+
+    pub number_of_configuration_table_entries: usize,
+    pub configuration_table: *mut ConfigurationTable,
+}
+
+impl SystemTable {
+    pub const SIGNATURE: u64 = 0x5453_5953_2049_4249;
+}
+
+impl Default for SystemTable {
+    /// Create a `SystemTable` with most fields set to zero.
+    ///
+    /// The only fields not set to zero are:
+    /// * [`Header::signature`] is set to [`SystemTable::SIGNATURE`].
+    /// * [`Header::size`] is set to the size in bytes of `SystemTable`.
+    fn default() -> Self {
+        Self {
+            header: Header {
+                signature: Self::SIGNATURE,
+                size: u32::try_from(mem::size_of::<Self>()).unwrap(),
+                ..Header::default()
+            },
+
+            firmware_vendor: ptr::null_mut(),
+            firmware_revision: 0,
+
+            stdin_handle: ptr::null_mut(),
+            stdin: ptr::null_mut(),
+
+            stdout_handle: ptr::null_mut(),
+            stdout: ptr::null_mut(),
+
+            stderr_handle: ptr::null_mut(),
+            stderr: ptr::null_mut(),
+
+            runtime_services: ptr::null_mut(),
+            boot_services: ptr::null_mut(),
+
+            number_of_configuration_table_entries: 0,
+            configuration_table: ptr::null_mut(),
+        }
+    }
+}