Skip to content

Commit b9c4944

Browse files
nicholasbishopphip1611
authored andcommitted
uefi: Delete the uefi::table::system module
1 parent d311ea2 commit b9c4944

File tree

4 files changed

+5
-187
lines changed

4 files changed

+5
-187
lines changed

uefi/CHANGELOG.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ See [Deprecating SystemTable/BootServices/RuntimeServices][funcmigrate] for
44
details of the deprecated items that were removed in this release.
55

66
## Changed
7-
- **Breaking:** Deleted the deprecated `BootServices` and `RuntimeServices`
8-
structs.
7+
- **Breaking:** Deleted the deprecated `BootServices`, `RuntimeServices`, and
8+
`SystemTable` structs.
99
- **Breaking:** Deleted deprecated functions `allocator::init`,
10-
`allocator::exit_boot_services`, `helpers::system_table`, and
11-
`table::system_table_runtime`.
10+
`allocator::exit_boot_services`, `helpers::system_table`,
11+
`table::system_table_boot`, and `table::system_table_runtime`.
1212
- **Breaking:** `FileSystem` no longer has a lifetime parameter, and the
1313
deprecated conversion from `uefi::table::boot::ScopedProtocol` has been
1414
removed.

uefi/src/prelude.rs

-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,3 @@
55
pub use crate::{
66
boot, cstr16, cstr8, entry, runtime, system, Handle, ResultExt, Status, StatusExt,
77
};
8-
9-
// Import the basic table types.
10-
#[allow(deprecated)]
11-
pub use crate::table::{Boot, SystemTable};

uefi/src/table/mod.rs

+1-22
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
pub mod cfg;
44

55
mod header;
6-
mod system;
76

87
pub use header::Header;
9-
#[allow(deprecated)]
10-
pub use system::{Boot, SystemTable};
118
pub use uefi_raw::table::Revision;
129

1310
use core::ptr::{self, NonNull};
@@ -53,30 +50,12 @@ pub(crate) fn system_table_raw_panicking() -> NonNull<uefi_raw::table::system::S
5350
/// This function should only be called as described above, and the
5451
/// `ptr` must be a valid [`SystemTable`].
5552
///
53+
/// [`SystemTable`]: uefi_raw::table::system::SystemTable
5654
/// [`set_virtual_address_map`]: uefi::runtime::set_virtual_address_map
5755
pub unsafe fn set_system_table(ptr: *const uefi_raw::table::system::SystemTable) {
5856
SYSTEM_TABLE.store(ptr.cast_mut(), Ordering::Release);
5957
}
6058

61-
/// Get the system table while boot services are active.
62-
#[deprecated = "Use the uefi::boot module instead. See https://github.com/rust-osdev/uefi-rs/blob/HEAD/docs/funcs_migration.md"]
63-
#[allow(deprecated)]
64-
pub fn system_table_boot() -> Option<SystemTable<Boot>> {
65-
let st = SYSTEM_TABLE.load(Ordering::Acquire);
66-
if st.is_null() {
67-
return None;
68-
}
69-
70-
// SAFETY: the system table is valid per the requirements of `set_system_table`.
71-
unsafe {
72-
if (*st).boot_services.is_null() {
73-
None
74-
} else {
75-
Some(SystemTable::<Boot>::from_ptr(st.cast()).unwrap())
76-
}
77-
}
78-
}
79-
8059
/// Common trait implemented by all standard UEFI tables.
8160
pub trait Table {
8261
/// A unique number assigned by the UEFI specification

uefi/src/table/system.rs

-157
This file was deleted.

0 commit comments

Comments
 (0)