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

REFACTOR: Removed unneeded value sets.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 16:07:20 +00:00
parent 9883b567ff
commit bcbda18e4d
110 changed files with 203 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DiscImageChef.Devices/Device/Constructor.cs
View File

@@ -134,7 +134,7 @@ namespace DiscImageChef.Devices
if(Error) throw new SystemException(string.Format("Error {0} trying device.", LastError));
bool scsiSense = true;
string ntDevicePath = null;
string ntDevicePath;
// Windows is answering SCSI INQUIRY for all device types so it needs to be detected first
switch(PlatformId) {
@@ -240,7 +240,7 @@ namespace DiscImageChef.Devices
if(Windows.Command.IsSdhci((SafeFileHandle)FileHandle))
{
byte[] sdBuffer = new byte[16];
bool sense = false;
bool sense;
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCsd, false, false,
MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
@@ -254,7 +254,6 @@ namespace DiscImageChef.Devices
}
sdBuffer = new byte[16];
sense = false;
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCid, false, false,
MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
@@ -268,7 +267,6 @@ namespace DiscImageChef.Devices
}
sdBuffer = new byte[8];
sense = false;
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
(MmcCommands)SecureDigitalCommands.SendScr, false, true,
@@ -285,7 +283,6 @@ namespace DiscImageChef.Devices
if(cachedScr != null)
{
sdBuffer = new byte[4];
sense = false;
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
(MmcCommands)SecureDigitalCommands
@@ -303,7 +300,6 @@ namespace DiscImageChef.Devices
else
{
sdBuffer = new byte[4];
sense = false;
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendOpCond, false,
true,

12
DiscImageChef.Devices/Device/MmcCommands/MMC.cs
View File

@@ -39,7 +39,7 @@ namespace DiscImageChef.Devices
public bool ReadCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
{
buffer = new byte[16];
bool sense = false;
bool sense;
LastError = SendMmcCommand(MmcCommands.SendCsd, false, false,
MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
@@ -54,7 +54,7 @@ namespace DiscImageChef.Devices
public bool ReadCid(out byte[] buffer, out uint[] response, uint timeout, out double duration)
{
buffer = new byte[16];
bool sense = false;
bool sense;
LastError = SendMmcCommand(MmcCommands.SendCid, false, false,
MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
@@ -69,7 +69,7 @@ namespace DiscImageChef.Devices
public bool ReadOcr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
{
buffer = new byte[4];
bool sense = false;
bool sense;
LastError = SendMmcCommand(MmcCommands.SendOpCond, false, true,
MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
@@ -84,7 +84,7 @@ namespace DiscImageChef.Devices
public bool ReadExtendedCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
{
buffer = new byte[512];
bool sense = false;
bool sense;
LastError = SendMmcCommand(MmcCommands.SendExtCsd, false, false,
MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 512, 1,
@@ -99,7 +99,7 @@ namespace DiscImageChef.Devices
public bool SetBlockLength(uint length, out uint[] response, uint timeout, out double duration)
{
byte[] buffer = new byte[0];
bool sense = false;
bool sense;
LastError = SendMmcCommand(MmcCommands.SetBlocklen, false, false,
MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length, 0,
@@ -115,7 +115,7 @@ namespace DiscImageChef.Devices
bool byteAddressed, uint timeout, out double duration)
{
buffer = new byte[transferLength * blockSize];
bool sense = false;
bool sense;
uint address;
if(byteAddressed) address = lba * blockSize;
else address = lba;

14
DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs
View File

@@ -64,27 +64,13 @@ namespace DiscImageChef.Devices
if(mode != FujitsuDisplayModes.Half)
if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
!ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = true;
halfMsg = false;
}
else if(ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
!ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = false;
halfMsg = false;
}
else if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = false;
halfMsg = true;
}
else
{
displayLen = false;
halfMsg = false;
}
buffer[0] = (byte)((byte)mode << 5);
if(displayLen) buffer[0] += 0x10;