Merge pull request #974 from nicholasbishop/bishop-remove-nonnull

uefi-services: Remove NonNull wrapper from system_table
rust-osdev · Oct 26, 2023 · 6240743 · 6240743
2 parents 3ae65f6 + 2e58314
commit 6240743
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@
 
 ## uefi-services - [Unreleased]
 
+### Changed
+- `uefi_services::system_table` now returns `SystemTable<Boot>` directly, rather
+  than wrapped in a `NonNull` pointer.
+
 ## uefi - 0.25.0 (2023-10-10)
 
 ### Changed

diff --git a/uefi-services/src/lib.rs b/uefi-services/src/lib.rs
@@ -65,12 +65,12 @@ static mut LOGGER: Option<uefi::logger::Logger> = None;
 ///
 /// The returned pointer is only valid until boot services are exited.
 #[must_use]
-pub fn system_table() -> NonNull<SystemTable<Boot>> {
+pub fn system_table() -> SystemTable<Boot> {
     unsafe {
         let table_ref = SYSTEM_TABLE
             .as_ref()
             .expect("The system table handle is not available");
-        NonNull::new(table_ref as *const _ as *mut _).unwrap()
+        table_ref.unsafe_clone()
     }
 }