uefi: Delete the uefi::table::system module

nicholasbishop · Sep 28, 2024 · 241327f · 241327f
1 parent faa4817
commit 241327f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 187 deletions.
diff --git a/uefi/CHANGELOG.md b/uefi/CHANGELOG.md
@@ -4,11 +4,11 @@ See [Deprecating SystemTable/BootServices/RuntimeServices][funcmigrate] for
 details of the deprecated items that were removed in this release.
 
 ## Changed
-- **Breaking:** Deleted the deprecated `BootServices` and `RuntimeServices`
-  structs.
+- **Breaking:** Deleted the deprecated `BootServices`, `RuntimeServices`, and
+  `SystemTable` structs.
 - **Breaking:** Deleted deprecated functions `allocator::init`,
-  `allocator::exit_boot_services`, `helpers::system_table`, and
-  `table::system_table_runtime`.
+  `allocator::exit_boot_services`, `helpers::system_table`,
+  `table::system_table_boot`, and `table::system_table_runtime`.
 - **Breaking:** `FileSystem` no longer has a lifetime parameter, and the
   deprecated conversion from `uefi::table::boot::ScopedProtocol` has been
   removed.

diff --git a/uefi/src/prelude.rs b/uefi/src/prelude.rs
@@ -5,7 +5,3 @@
 pub use crate::{
     boot, cstr16, cstr8, entry, runtime, system, Handle, ResultExt, Status, StatusExt,
 };
-
-// Import the basic table types.
-#[allow(deprecated)]
-pub use crate::table::{Boot, SystemTable};
diff --git a/uefi/src/table/mod.rs b/uefi/src/table/mod.rs
@@ -3,11 +3,8 @@
 pub mod cfg;
 
 mod header;
-mod system;
 
 pub use header::Header;
-#[allow(deprecated)]
-pub use system::{Boot, SystemTable};
 pub use uefi_raw::table::Revision;
 
 use core::ptr::{self, NonNull};
@@ -58,25 +55,6 @@ pub unsafe fn set_system_table(ptr: *const uefi_raw::table::system::SystemTable)
     SYSTEM_TABLE.store(ptr.cast_mut(), Ordering::Release);
 }
 
-/// Get the system table while boot services are active.
-#[deprecated = "Use the uefi::boot module instead. See https://github.com/rust-osdev/uefi-rs/blob/HEAD/docs/funcs_migration.md"]
-#[allow(deprecated)]
-pub fn system_table_boot() -> Option<SystemTable<Boot>> {
-    let st = SYSTEM_TABLE.load(Ordering::Acquire);
-    if st.is_null() {
-        return None;
-    }
-
-    // SAFETY: the system table is valid per the requirements of `set_system_table`.
-    unsafe {
-        if (*st).boot_services.is_null() {
-            None
-        } else {
-            Some(SystemTable::<Boot>::from_ptr(st.cast()).unwrap())
-        }
-    }
-}
-
 /// Common trait implemented by all standard UEFI tables.
 pub trait Table {
     /// A unique number assigned by the UEFI specification

diff --git a/uefi/src/table/system.rs b/uefi/src/table/system.rs