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: Use preferred braces style.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 23:07:46 +00:00
parent 4158d64854
commit e9443388ee
120 changed files with 1016 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscImageChef.Decoders/SCSI/Inquiry.cs
View File

@@ -223,10 +223,7 @@ namespace DiscImageChef.Decoders.SCSI
else descriptorsNo = (SCSIInquiryResponse.Length - 58) / 2;
decoded.VersionDescriptors = new ushort[descriptorsNo];
for(int i = 0; i < descriptorsNo; i++)
{
decoded.VersionDescriptors[i] = BitConverter.ToUInt16(SCSIInquiryResponse, 58 + i * 2);
}
for(int i = 0; i < descriptorsNo; i++) decoded.VersionDescriptors[i] = BitConverter.ToUInt16(SCSIInquiryResponse, 58 + i * 2);
}
if(SCSIInquiryResponse.Length >= 75 && SCSIInquiryResponse.Length < 96)
@@ -500,9 +497,7 @@ namespace DiscImageChef.Decoders.SCSI
}
if(response.VersionDescriptors != null)
{
foreach(ushort VersionDescriptor in response.VersionDescriptors)
{
switch(VersionDescriptor)
{
case 0xFFFF:
@@ -1917,8 +1912,6 @@ namespace DiscImageChef.Decoders.SCSI
.AppendLine();
break;
}
}
}
#region Quantum vendor prettifying
if(response.QuantumPresent &&
@@ -2027,10 +2020,8 @@ namespace DiscImageChef.Decoders.SCSI
#region Kreon vendor prettifying
if(response.KreonPresent)
{
sb.AppendFormat("Drive is flashed with Kreon firmware {0}.",
StringHandlers.CToString(response.KreonVersion)).AppendLine();
}
#endregion Kreon vendor prettifying
#if DEBUG
@@ -2051,7 +2042,6 @@ namespace DiscImageChef.Decoders.SCSI
}
if(response.VendorSpecific != null)
{
if(response.KreonPresent)
{
byte[] vendor = new byte[7];
@@ -2068,7 +2058,6 @@ namespace DiscImageChef.Decoders.SCSI
sb.AppendLine(PrintHex.ByteArrayToHexArrayString(response.VendorSpecific, 60));
sb.AppendLine("============================================================");
}
}
if(response.VendorSpecific2 != null)
{

13
DiscImageChef.Decoders/SCSI/MMC/Features.cs
View File

@@ -3728,10 +3728,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC
decoded.ME |= (feature[4] & 0x01) == 0x01;
decoded.Profiles = new ushort[feature[5]];
if(feature[5] * 2 + 6 == feature.Length)
{
for(int i = 0; i < feature[5]; i++)
decoded.Profiles[i] = (ushort)((feature[0 + 6 + 2 * i] << 8) + feature[1 + 6 + 2 * i]);
}
}
return decoded;
@@ -3746,7 +3744,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendLine("MMC Supported Profiles:");
if(ftr.Profiles != null)
{
foreach(Profile prof in ftr.Profiles)
{
switch(prof.Number)
@@ -3876,7 +3873,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC
if(prof.Current) sb.AppendLine(" (current)");
else sb.AppendLine();
}
}
return sb.ToString();
}
@@ -4454,10 +4450,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendLine("MMC Layer Jump Recording:");
if(ftr.LinkSizes != null)
{
foreach(byte link in ftr.LinkSizes)
sb.AppendFormat("\tCurrent media has a {0} bytes link available", link).AppendLine();
}
return sb.ToString();
}
@@ -4797,10 +4791,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
Feature_010A ftr = feature.Value;
StringBuilder sb = new StringBuilder();
if(ftr.DCBs != null)
{
foreach(uint DCB in ftr.DCBs) sb.AppendFormat("Drive supports DCB {0:X8}h", DCB).AppendLine();
}
if(ftr.DCBs != null) foreach(uint DCB in ftr.DCBs) sb.AppendFormat("Drive supports DCB {0:X8}h", DCB).AppendLine();
return sb.ToString();
}
@@ -4956,10 +4947,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC
if(ftr.ME) sb.AppendLine("\tDrive will only record on the OSSC Disc Format");
if(ftr.Profiles != null)
{
for(int i = 0; i < ftr.Profiles.Length; i++)
sb.AppendFormat("\tProfile {0}: {1}", i, ftr.Profiles[i]).AppendLine();
}
return sb.ToString();
}

7
DiscImageChef.Decoders/SCSI/MMC/Hybrid.cs
View File

@@ -122,10 +122,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
decoded.FormatLayers = new ushort[(FormatLayersResponse.Length - 6) / 2];
for(int i = 0; i < (FormatLayersResponse.Length - 6) / 2; i++)
{
decoded.FormatLayers[i] = BigEndianBitConverter.ToUInt16(FormatLayersResponse, i * 2 + 6);
}
for(int i = 0; i < (FormatLayersResponse.Length - 6) / 2; i++) decoded.FormatLayers[i] = BigEndianBitConverter.ToUInt16(FormatLayersResponse, i * 2 + 6);
return decoded;
}
@@ -141,7 +138,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendFormat("{0} format layers recognized", response.NumberOfLayers);
for(int i = 0; i < response.FormatLayers.Length; i++)
{
switch(response.FormatLayers[i])
{
case (ushort)FormatLayerTypeCodes.BDLayer:
@@ -181,7 +177,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC
break;
}
}
}
return sb.ToString();
}

12
DiscImageChef.Decoders/SCSI/ModesEncoders.cs
View File

@@ -89,7 +89,7 @@ namespace DiscImageChef.Decoders.SCSI
public static byte[] EncodeMode6(DecodedMode mode, PeripheralDeviceTypes deviceType)
{
int modeSize = 0;
if(mode.Pages != null) { foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length; }
if(mode.Pages != null) foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length;
byte[] hdr = EncodeModeHeader6(mode.Header, deviceType);
modeSize += hdr.Length;
@@ -113,7 +113,7 @@ namespace DiscImageChef.Decoders.SCSI
public static byte[] EncodeMode10(DecodedMode mode, PeripheralDeviceTypes deviceType)
{
int modeSize = 0;
if(mode.Pages != null) { foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length; }
if(mode.Pages != null) foreach(ModePage page in mode.Pages) modeSize += page.PageResponse.Length;
byte[] hdr = EncodeModeHeader10(mode.Header, deviceType);
modeSize += hdr.Length;
@@ -144,10 +144,8 @@ namespace DiscImageChef.Decoders.SCSI
byte[] hdr;
if(header.BlockDescriptors != null)
{
if(longLBA) hdr = new byte[8 + header.BlockDescriptors.Length * 16];
else hdr = new byte[8 + header.BlockDescriptors.Length * 8];
}
else hdr = new byte[8];
hdr[2] = (byte)header.MediumType;
@@ -177,9 +175,7 @@ namespace DiscImageChef.Decoders.SCSI
if(longLBA) hdr[4] += 0x01;
if(header.BlockDescriptors != null)
{
if(longLBA)
{
for(int i = 0; i < header.BlockDescriptors.Length; i++)
{
byte[] temp = BitConverter.GetBytes(header.BlockDescriptors[i].Blocks);
@@ -196,9 +192,7 @@ namespace DiscImageChef.Decoders.SCSI
hdr[14 + i * 16 + 8] = (byte)((header.BlockDescriptors[i].BlockLength & 0xFF00) >> 8);
hdr[15 + i * 16 + 8] = (byte)(header.BlockDescriptors[i].BlockLength & 0xFF);
}
}
else
{
for(int i = 0; i < header.BlockDescriptors.Length; i++)
{
if(deviceType != PeripheralDeviceTypes.DirectAccess)
@@ -211,8 +205,6 @@ namespace DiscImageChef.Decoders.SCSI
hdr[6 + i * 8 + 8] = (byte)((header.BlockDescriptors[i].BlockLength & 0xFF00) >> 8);
hdr[7 + i * 8 + 8] = (byte)(header.BlockDescriptors[i].BlockLength & 0xFF);
}
}
}
return hdr;
}