TESTCOMMIT: Make certain ScsiDevice actions require mutable

Author: seijikun

uefi-raw/src/protocol/scsi.rs

@@ -128,7 +128,7 @@ pub struct ExtScsiPassThruMode {
 pub struct ExtScsiPassThruProtocol {
     pub passthru_mode: *const ExtScsiPassThruMode,
     pub pass_thru: unsafe extern "efiapi" fn(
-        this: *const Self,
+        this: *mut Self,
         target: *const u8,
         lun: u64,
         packet: *mut ScsiIoScsiRequestPacket,
@@ -150,7 +150,7 @@ pub struct ExtScsiPassThruProtocol {
     ) -> Status,
     pub reset_channel: unsafe extern "efiapi" fn(this: *mut Self) -> Status,
     pub reset_target_lun:
-        unsafe extern "efiapi" fn(this: *const Self, target: *const u8, lun: u64) -> Status,
+        unsafe extern "efiapi" fn(this: *mut Self, target: *const u8, lun: u64) -> Status,
     pub get_next_target:
         unsafe extern "efiapi" fn(this: *const Self, target: *mut *mut u8) -> Status,
 }

uefi/src/proto/scsi/pass_thru.rs

@@ -7,6 +7,7 @@ use crate::helpers::AlignedBuffer;
 use crate::proto::unsafe_protocol;
 use crate::StatusExt;
 use core::alloc::LayoutError;
+use core::marker::PhantomData;
 use core::ptr;
 use uefi_raw::protocol::scsi::{
     ExtScsiPassThruMode, ExtScsiPassThruProtocol, SCSI_TARGET_MAX_BYTES,
@@ -121,8 +122,9 @@ impl ExtScsiPassThru {
 /// You have to probe for availability before doing anything meaningful with it.
 #[derive(Clone, Debug)]
 pub struct ScsiDevice<'a> {
-    proto: &'a ExtScsiPassThruProtocol,
+    proto: *const ExtScsiPassThruProtocol,
     target_lun: ScsiTargetLun,
+    _phantom: PhantomData<&'a ()>
 }
 impl ScsiDevice<'_> {
     /// Returns the SCSI target address of the potential device.
@@ -155,9 +157,9 @@ impl ScsiDevice<'_> {
     ///   specified by `Target` and `Lun`.
     /// - [`Status::TIMEOUT`] A timeout occurred while attempting to reset the SCSI device specified
     ///   by `Target` and `Lun`.
-    pub fn reset(&self) -> crate::Result<()> {
+    pub fn reset(&mut self) -> crate::Result<()> {
         unsafe {
-            (self.proto.reset_target_lun)(self.proto, self.target_lun.0.as_ptr(), self.lun())
+            ((*self.proto).reset_target_lun)(self.proto.cast_mut(), self.target_lun.0.as_ptr(), self.lun())
                 .to_result()
         }
     }
@@ -196,12 +198,12 @@ impl ScsiDevice<'_> {
     /// - [`Status::TIMEOUT`] A timeout occurred while executing the SCSI Request Packet. Additional status
     ///   information is available in `HostAdapterStatus`, `TargetStatus`, `SenseDataLength`, and `SenseData`.
     pub fn execute_command<'req>(
-        &self,
+        &mut self,
         mut scsi_req: ScsiRequest<'req>,
     ) -> crate::Result<ScsiResponse<'req>> {
         unsafe {
-            (self.proto.pass_thru)(
-                self.proto,
+            ((*self.proto).pass_thru)(
+                self.proto.cast_mut(),
                 self.target_lun.0.as_ptr(),
                 self.target_lun.1,
                 &mut scsi_req.packet,
@@ -236,6 +238,7 @@ impl<'a> Iterator for ScsiTargetLunIterator<'a> {
         let scsi_device = ScsiDevice {
             proto: self.proto,
             target_lun: self.prev.clone(),
+            _phantom: Default::default()
         };
         match result {
             Status::SUCCESS => Some(scsi_device),