x

Author: phip1611

uefi/src/data_types/mod.rs

@@ -40,6 +40,7 @@ use {
     crate::proto::device_path::DevicePath,
     crate::proto::driver::ComponentName2,
 };
+use uefi_raw::Status;
 
 /// Opaque handle to an UEFI entity (protocol, image...), guaranteed to be non-null.
 ///
@@ -103,6 +104,8 @@ impl Handle {
 
     /// Opens the underlying [`ComponentName2`], if it exists.
     ///
+    /// Returns [`Status::UNSUPPORTED`] if the protocol doesn't exist.
+    ///
     /// # Example
     /// ```rust,no_run
     /// # use uefi::Handle;
@@ -118,10 +121,10 @@ impl Handle {
     /// );
     /// ```
     #[cfg(feature = "alloc")]
-    pub fn component_name2(&self) -> Result<Option<ScopedProtocol<ComponentName2>>> {
+    pub fn component_name2(&self) -> Result<ScopedProtocol<ComponentName2>> {
         // SAFETY: The protocol is only used for reading data.
         unsafe {
-            boot::open_protocol_if_exists::<ComponentName2>(
+            boot::open_protocol::<ComponentName2>(
                 OpenProtocolParams {
                     handle: *self,
                     agent: boot::image_handle(),
@@ -132,7 +135,9 @@ impl Handle {
         }
     }
 
-    /// Opens the underlying [`DevicePath`] protocol, if it exists.
+    /// Opens the underlying [`DevicePath`] protocol.
+    ///
+    /// Returns [`Status::UNSUPPORTED`] if the protocol doesn't exist.
     ///
     /// # Example
     /// ```rust,no_run
@@ -145,10 +150,10 @@ impl Handle {
     /// log::info!("device path: {device_path}");
     /// ```
     #[cfg(feature = "alloc")]
-    pub fn device_path(&self) -> Result<Option<ScopedProtocol<DevicePath>>> {
+    pub fn device_path(&self) -> Result<ScopedProtocol<DevicePath>> {
         // SAFETY: The protocol is only used for reading data.
         unsafe {
-            boot::open_protocol_if_exists::<DevicePath>(
+            boot::open_protocol::<DevicePath>(
                 OpenProtocolParams {
                     handle: *self,
                     agent: boot::image_handle(),