[test] expect test. Drop the Option so that the caller is forced to provide a valid input.

Author: sky5454

uefi-raw/src/protocol/misc.rs

@@ -29,16 +29,16 @@ pub struct TimestampProperties {
 #[repr(C)]
 pub struct ResetNotificationProtocol {
     pub register_reset_notify:
-        unsafe extern "efiapi" fn(this: *mut Self, reset_function: Option<ResetSystemFn>) -> Status,
+        unsafe extern "efiapi" fn(this: *mut Self, reset_function: ResetSystemFn) -> Status,
     pub unregister_reset_notify:
-        unsafe extern "efiapi" fn(this: *mut Self, reset_function: Option<ResetSystemFn>) -> Status,
+        unsafe extern "efiapi" fn(this: *mut Self, reset_function: ResetSystemFn) -> Status,
 }
 
 impl ResetNotificationProtocol {
     pub const GUID: Guid = guid!("9da34ae0-eaf9-4bbf-8ec3-fd60226c44be");
 }
 
-/// Raw reset notification function, to be called if you register it when a RestSystem() is executed.
+/// Raw reset notification function, to be called if you register it when a ResetSystem() is executed.
 pub type ResetSystemFn = unsafe extern "efiapi" fn(
     rt: runtime::ResetType,
     status: Status,

uefi-test-runner/src/proto/misc.rs

@@ -9,52 +9,36 @@ pub fn test(bt: &BootServices) {
 pub fn test_reset_notification(bt: &BootServices) {
     info!("Running loaded ResetNotification protocol test");
 
-    let handle = bt.get_handle_for_protocol::<ResetNotification>();
-
-    match handle {
-        Ok(handle) => {
-            let mut reset_notif_proto = bt
-                .open_protocol_exclusive::<ResetNotification>(handle)
-                .expect("Founded ResetNotification Protocol but open failed");
-            let result = reset_notif_proto.register_reset_notify(None);
-            info!(
-                "ResetNotification Protocol register null test: {:?}",
-                result
-            );
-
-            let result = reset_notif_proto.unregister_reset_notify(None);
-            info!(
-                "ResetNotification Protocol unregister null test: {:?}",
-                result
-            );
-
-            // value efi_reset_fn is the type of ResetSystemFn, a function pointer
-            unsafe extern "efiapi" fn efi_reset_fn(
-                rt: runtime::ResetType,
-                status: Status,
-                data_size: usize,
-                data: *const u8,
-            ) {
-                info!("Inside the event callback, hi, efi_reset_fn");
-                info!("rt: {:?} status: {:?}", rt, status);
-                info!("size: {:?} data: {:?}", data_size, data);
-                // do what you want
-            }
-
-            let result = reset_notif_proto.register_reset_notify(Some(efi_reset_fn));
-            info!(
-                "ResetNotification Protocol register efi_reset_fn test: {:?}",
-                result
-            );
-
-            let result = reset_notif_proto.unregister_reset_notify(Some(efi_reset_fn));
-            info!(
-                "ResetNotification Protocol unregister efi_reset_fn test: {:?}",
-                result
-            );
-        }
-        Err(err) => {
-            warn!("Failed to found ResetNotification Protocol: {:?}", err);
-        }
+    let handle = bt
+        .get_handle_for_protocol::<ResetNotification>()
+        .expect("Failed to get handles for `ResetNotification` protocol");
+
+    let mut reset_notif_proto = bt
+        .open_protocol_exclusive::<ResetNotification>(handle)
+        .expect("Founded ResetNotification Protocol but open failed");
+
+    // value efi_reset_fn is the type of ResetSystemFn, a function pointer
+    unsafe extern "efiapi" fn efi_reset_fn(
+        rt: runtime::ResetType,
+        status: Status,
+        data_size: usize,
+        data: *const u8,
+    ) {
+        info!("Inside the event callback, hi, efi_reset_fn");
+        info!("rt: {:?} status: {:?}", rt, status);
+        info!("size: {:?} data: {:?}", data_size, data);
+        // do what you want
     }
+
+    let result = reset_notif_proto.register_reset_notify(efi_reset_fn);
+    info!(
+        "ResetNotification Protocol register efi_reset_fn test: {:?}",
+        result
+    );
+
+    let result = reset_notif_proto.unregister_reset_notify(efi_reset_fn);
+    info!(
+        "ResetNotification Protocol unregister efi_reset_fn test: {:?}",
+        result
+    );
 }

uefi/src/proto/misc.rs

@@ -68,16 +68,16 @@ impl ResetNotification {
     ///         .open_protocol_exclusive::<ResetNotification>(image)
     ///         .expect("Failed to open Timestamp protocol");
     ///
-    ///     rn.register_reset_notify(Some(efi_reset_fn))
+    ///     rn.register_reset_notify(efi_reset_fn)
     ///         .expect("Failed to register a reset notification function!");
     /// }
     /// ```
-    pub fn register_reset_notify(&mut self, reset_function: Option<ResetSystemFn>) -> Result {
+    pub fn register_reset_notify(&mut self, reset_function: ResetSystemFn) -> Result {
         unsafe { (self.0.register_reset_notify)(&mut self.0, reset_function) }.to_result()
     }
 
     /// Remove a reset notification function that was previously registered with [`ResetNotification::register_reset_notify`].
-    pub fn unregister_reset_notify(&mut self, reset_function: Option<ResetSystemFn>) -> Result {
+    pub fn unregister_reset_notify(&mut self, reset_function: ResetSystemFn) -> Result {
         unsafe { (self.0.unregister_reset_notify)(&mut self.0, reset_function) }.to_result()
     }
 }