aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consider 0 to be "current default timeout", otherwise some device commands / operating system combinations fail. Fixes #472

Browse Source
This commit is contained in:
Natalia Portillo
2021-08-12 03:00:22 +01:00
parent 10d286ada6
commit a9968f9de7
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Aaru.Devices/Device/Commands.cs
View File

@@ -54,6 +54,10 @@ namespace Aaru.Devices
public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout, public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
ScsiDirection direction, out double duration, out bool sense) ScsiDirection direction, out double duration, out bool sense)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
if(!(_remote is null)) if(!(_remote is null))
return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, direction, out duration, return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
out sense); out sense);
@@ -80,6 +84,10 @@ namespace Aaru.Devices
AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer, AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
uint timeout, bool transferBlocks, out double duration, out bool sense) uint timeout, bool transferBlocks, out double duration, out bool sense)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
if(!(_remote is null)) if(!(_remote is null))
return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer, return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
timeout, transferBlocks, out duration, out sense); timeout, transferBlocks, out duration, out sense);
@@ -107,6 +115,10 @@ namespace Aaru.Devices
AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer, AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
uint timeout, bool transferBlocks, out double duration, out bool sense) uint timeout, bool transferBlocks, out double duration, out bool sense)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
if(!(_remote is null)) if(!(_remote is null))
return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer, return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
timeout, transferBlocks, out duration, out sense); timeout, transferBlocks, out duration, out sense);
@@ -134,6 +146,10 @@ namespace Aaru.Devices
AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer, AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
uint timeout, bool transferBlocks, out double duration, out bool sense) uint timeout, bool transferBlocks, out double duration, out bool sense)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
if(!(_remote is null)) if(!(_remote is null))
return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer, return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
timeout, transferBlocks, out duration, out sense); timeout, transferBlocks, out duration, out sense);
@@ -159,8 +175,12 @@ namespace Aaru.Devices
/// <param name="blockSize">Size of block in bytes</param> /// <param name="blockSize">Size of block in bytes</param>
public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument, public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
uint blockSize, uint blocks, ref byte[] buffer, out uint[] response, uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
out double duration, out bool sense, uint timeout = 0) out double duration, out bool sense, uint timeout = 15)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
switch(command) switch(command)
{ {
case MmcCommands.SendCid when _cachedCid != null: case MmcCommands.SendCid when _cachedCid != null:
@@ -236,8 +256,12 @@ namespace Aaru.Devices
} }
public int SendMultipleMmcCommands(MmcSingleCommand[] commands, out double duration, out bool sense, public int SendMultipleMmcCommands(MmcSingleCommand[] commands, out double duration, out bool sense,
uint timeout = 0) uint timeout = 15)
{ {
// We need a timeout
if(timeout == 0)
timeout = Timeout > 0 ? Timeout : 15;
if(_remote is null) if(_remote is null)
return Command.SendMultipleMmcCommands(PlatformId, FileHandle, commands, out duration, out sense, return Command.SendMultipleMmcCommands(PlatformId, FileHandle, commands, out duration, out sense,
timeout); timeout);