Merge pull request #858 from nicholasbishop/bishop-handle-event-methods

uefi: Add raw pointer Event/Handle methods

Author: phip1611

CHANGELOG.md

@@ -6,6 +6,7 @@
 - `DevicePath::to_boxed`, `DevicePath::to_owned`, and `DevicePath::as_bytes`
 - `DevicePathInstance::to_boxed`, `DevicePathInstance::to_owned`, and `DevicePathInstance::as_bytes`
 - `DevicePathNode::data`
+- Added `Event::from_ptr`, `Event::as_ptr`, and `Handle::as_ptr`.
 
 ### Changed
 - Renamed `LoadImageSource::FromFilePath` to `LoadImageSource::FromDevicePath`

uefi/src/data_types/mod.rs

@@ -36,6 +36,12 @@ impl Handle {
         // shorthand for "|ptr| Self(ptr)"
         NonNull::new(ptr).map(Self)
     }
+
+    /// Get the underlying raw pointer.
+    #[must_use]
+    pub fn as_ptr(&self) -> *mut c_void {
+        self.0.as_ptr()
+    }
 }
 
 /// Handle to an event structure, guaranteed to be non-null.
@@ -56,6 +62,21 @@ impl Event {
     pub const unsafe fn unsafe_clone(&self) -> Self {
         Self(self.0)
     }
+
+    /// Create an `Event` from a raw pointer.
+    ///
+    /// # Safety
+    ///
+    /// The caller must ensure that the pointer is valid.
+    pub unsafe fn from_ptr(ptr: *mut c_void) -> Option<Self> {
+        NonNull::new(ptr).map(Self)
+    }
+
+    /// Get the underlying raw pointer.
+    #[must_use]
+    pub fn as_ptr(&self) -> *mut c_void {
+        self.0.as_ptr()
+    }
 }
 
 /// Trait for querying the alignment of a struct.