Merge pull request #1635 from JarlEvanson/enable-access

Enable access to hidden RAII guard components

Author: nicholasbishop

uefi/CHANGELOG.md

@@ -11,6 +11,8 @@
 - Added `proto::scsi::pass_thru::ExtScsiPassThru`.
 - Added `proto::nvme::pass_thru::NvmePassThru`.
 - Added `proto::ata::pass_thru::AtaPassThru`.
+- Added `boot::ScopedProtocol::open_params()`.
+- Added `boot::TplGuard::old_tpl()`.
 
 ## Changed
 - **Breaking:** Removed `BootPolicyError` as `BootPolicy` construction is no

uefi/src/boot.rs

@@ -1536,6 +1536,14 @@ pub struct ScopedProtocol<P: Protocol + ?Sized> {
     open_params: OpenProtocolParams,
 }
 
+impl<P: Protocol + ?Sized> ScopedProtocol<P> {
+    /// Returns the [`OpenProtocolParams`] used to open the [`ScopedProtocol`].
+    #[must_use]
+    pub const fn open_params(&self) -> OpenProtocolParams {
+        self.open_params
+    }
+}
+
 impl<P: Protocol + ?Sized> Drop for ScopedProtocol<P> {
     fn drop(&mut self) {
         let bt = boot_services_raw_panicking();
@@ -1598,6 +1606,14 @@ pub struct TplGuard {
     old_tpl: Tpl,
 }
 
+impl TplGuard {
+    /// Returns the previous [`Tpl`].
+    #[must_use]
+    pub const fn old_tpl(&self) -> Tpl {
+        self.old_tpl
+    }
+}
+
 impl Drop for TplGuard {
     fn drop(&mut self) {
         let bt = boot_services_raw_panicking();
@@ -1659,7 +1675,7 @@ pub enum OpenProtocolAttributes {
 }
 
 /// Parameters passed to [`open_protocol`].
-#[derive(Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct OpenProtocolParams {
     /// The handle for the protocol to open.
     pub handle: Handle,