diff --git a/ATA/Identify.cs b/ATA/Identify.cs index b1e721a15..f324d8240 100644 --- a/ATA/Identify.cs +++ b/ATA/Identify.cs @@ -813,73 +813,73 @@ namespace Aaru.Decoders.ATA if(minatalevel <= 5) if(ATAID.CurrentSectors > 0) sb.AppendFormat("Device size in CHS mode: {0} bytes, {1} Mb, {2} MiB", - (ulong)ATAID.CurrentSectors * logicalSectorSize, - ((ulong)ATAID.CurrentSectors * logicalSectorSize) / 1000 / 1000, - ((ulong)ATAID.CurrentSectors * 512) / 1024 / 1024).AppendLine(); + (ulong)ATAID.CurrentSectors * logicalSectorSize, + (ulong)ATAID.CurrentSectors * logicalSectorSize / 1000 / 1000, + (ulong)ATAID.CurrentSectors * 512 / 1024 / 1024).AppendLine(); else { ulong currentSectors = (ulong)(ATAID.Cylinders * ATAID.Heads * ATAID.SectorsPerTrack); sb.AppendFormat("Device size in CHS mode: {0} bytes, {1} Mb, {2} MiB", - currentSectors * logicalSectorSize, - (currentSectors * logicalSectorSize) / 1000 / 1000, - (currentSectors * 512) / 1024 / 1024).AppendLine(); + currentSectors * logicalSectorSize, + currentSectors * logicalSectorSize / 1000 / 1000, + currentSectors * 512 / 1024 / 1024).AppendLine(); } if(ATAID.Capabilities.HasFlag(CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.LBASupport)) - if(((ulong)ATAID.LBASectors * logicalSectorSize) / 1024 / 1024 > 1000000) + if((ulong)ATAID.LBASectors * logicalSectorSize / 1024 / 1024 > 1000000) sb.AppendFormat("Device size in 28-bit LBA mode: {0} bytes, {1} Tb, {2} TiB", (ulong)ATAID.LBASectors * logicalSectorSize, - ((ulong)ATAID.LBASectors * logicalSectorSize) / 1000 / 1000 / 1000 / 1000, - ((ulong)ATAID.LBASectors * 512) / 1024 / 1024 / 1024 / 1024).AppendLine(); - else if(((ulong)ATAID.LBASectors * logicalSectorSize) / 1024 / 1024 > 1000) + (ulong)ATAID.LBASectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000, + (ulong)ATAID.LBASectors * 512 / 1024 / 1024 / 1024 / 1024).AppendLine(); + else if((ulong)ATAID.LBASectors * logicalSectorSize / 1024 / 1024 > 1000) sb.AppendFormat("Device size in 28-bit LBA mode: {0} bytes, {1} Gb, {2} GiB", - (ulong)ATAID.LBASectors * logicalSectorSize, - ((ulong)ATAID.LBASectors * logicalSectorSize) / 1000 / 1000 / 1000, - ((ulong)ATAID.LBASectors * 512) / 1024 / 1024 / 1024).AppendLine(); + (ulong)ATAID.LBASectors * logicalSectorSize, + (ulong)ATAID.LBASectors * logicalSectorSize / 1000 / 1000 / 1000, + (ulong)ATAID.LBASectors * 512 / 1024 / 1024 / 1024).AppendLine(); else sb.AppendFormat("Device size in 28-bit LBA mode: {0} bytes, {1} Mb, {2} MiB", - (ulong)ATAID.LBASectors * logicalSectorSize, - ((ulong)ATAID.LBASectors * logicalSectorSize) / 1000 / 1000, - ((ulong)ATAID.LBASectors * 512) / 1024 / 1024).AppendLine(); + (ulong)ATAID.LBASectors * logicalSectorSize, + (ulong)ATAID.LBASectors * logicalSectorSize / 1000 / 1000, + (ulong)ATAID.LBASectors * 512 / 1024 / 1024).AppendLine(); if(ATAID.CommandSet2.HasFlag(CommonTypes.Structs.Devices.ATA.Identify.CommandSetBit2.LBA48)) if(ATAID.CommandSet5.HasFlag(CommonTypes.Structs.Devices.ATA.Identify.CommandSetBit5.ExtSectors)) - if((ATAID.ExtendedUserSectors * logicalSectorSize) / 1024 / 1024 > 1000000) + if(ATAID.ExtendedUserSectors * logicalSectorSize / 1024 / 1024 > 1000000) sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Tb, {2} TiB", - ATAID.ExtendedUserSectors * logicalSectorSize, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1000 / 1000 / 1000 / 1000, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1024 / 1024 / 1024 / + ATAID.ExtendedUserSectors * logicalSectorSize, + ATAID.ExtendedUserSectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000, + ATAID.ExtendedUserSectors * logicalSectorSize / 1024 / 1024 / 1024 / 1024).AppendLine(); - else if((ATAID.ExtendedUserSectors * logicalSectorSize) / 1024 / 1024 > 1000) + else if(ATAID.ExtendedUserSectors * logicalSectorSize / 1024 / 1024 > 1000) sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Gb, {2} GiB", - ATAID.ExtendedUserSectors * logicalSectorSize, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1000 / 1000 / 1000, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1024 / 1024 / 1024). + ATAID.ExtendedUserSectors * logicalSectorSize, + ATAID.ExtendedUserSectors * logicalSectorSize / 1000 / 1000 / 1000, + ATAID.ExtendedUserSectors * logicalSectorSize / 1024 / 1024 / 1024). AppendLine(); else sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Mb, {2} MiB", - ATAID.ExtendedUserSectors * logicalSectorSize, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1000 / 1000, - (ATAID.ExtendedUserSectors * logicalSectorSize) / 1024 / 1024).AppendLine(); + ATAID.ExtendedUserSectors * logicalSectorSize, + ATAID.ExtendedUserSectors * logicalSectorSize / 1000 / 1000, + ATAID.ExtendedUserSectors * logicalSectorSize / 1024 / 1024).AppendLine(); else { - if((ATAID.LBA48Sectors * logicalSectorSize) / 1024 / 1024 > 1000000) + if(ATAID.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000000) sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Tb, {2} TiB", - ATAID.LBA48Sectors * logicalSectorSize, - (ATAID.LBA48Sectors * logicalSectorSize) / 1000 / 1000 / 1000 / 1000, - (ATAID.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024). + ATAID.LBA48Sectors * logicalSectorSize, + ATAID.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000, + ATAID.LBA48Sectors * logicalSectorSize / 1024 / 1024 / 1024 / 1024). AppendLine(); - else if((ATAID.LBA48Sectors * logicalSectorSize) / 1024 / 1024 > 1000) + else if(ATAID.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000) sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Gb, {2} GiB", - ATAID.LBA48Sectors * logicalSectorSize, - (ATAID.LBA48Sectors * logicalSectorSize) / 1000 / 1000 / 1000, - (ATAID.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024).AppendLine(); + ATAID.LBA48Sectors * logicalSectorSize, + ATAID.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000, + ATAID.LBA48Sectors * logicalSectorSize / 1024 / 1024 / 1024).AppendLine(); else sb.AppendFormat("Device size in 48-bit LBA mode: {0} bytes, {1} Mb, {2} MiB", - ATAID.LBA48Sectors * logicalSectorSize, - (ATAID.LBA48Sectors * logicalSectorSize) / 1000 / 1000, - (ATAID.LBA48Sectors * logicalSectorSize) / 1024 / 1024).AppendLine(); + ATAID.LBA48Sectors * logicalSectorSize, + ATAID.LBA48Sectors * logicalSectorSize / 1000 / 1000, + ATAID.LBA48Sectors * logicalSectorSize / 1024 / 1024).AppendLine(); } if(ata1 || cfa) @@ -934,21 +934,21 @@ namespace Aaru.Decoders.ATA { case 1: sb.AppendFormat("{0} KiB of single ported single sector buffer", - (ATAID.BufferSize * 512) / 1024).AppendLine(); + ATAID.BufferSize * 512 / 1024).AppendLine(); break; case 2: - sb.AppendFormat("{0} KiB of dual ported multi sector buffer", (ATAID.BufferSize * 512) / 1024). + sb.AppendFormat("{0} KiB of dual ported multi sector buffer", ATAID.BufferSize * 512 / 1024). AppendLine(); break; case 3: sb.AppendFormat("{0} KiB of dual ported multi sector buffer with read caching", - (ATAID.BufferSize * 512) / 1024).AppendLine(); + ATAID.BufferSize * 512 / 1024).AppendLine(); break; default: - sb.AppendFormat("{0} KiB of unknown type {1} buffer", (ATAID.BufferSize * 512) / 1024, + sb.AppendFormat("{0} KiB of unknown type {1} buffer", ATAID.BufferSize * 512 / 1024, ATAID.BufferType).AppendLine(); break; diff --git a/CD/SectorBuilder.cs b/CD/SectorBuilder.cs index 9ce88d148..c3a28c6b8 100644 --- a/CD/SectorBuilder.cs +++ b/CD/SectorBuilder.cs @@ -58,7 +58,7 @@ namespace Aaru.Decoders.CD } static (byte minute, byte second, byte frame) LbaToMsf(long pos) => - ((byte)((pos + 150) / 75 / 60), (byte)(((pos + 150) / 75) % 60), (byte)((pos + 150) % 75)); + ((byte)((pos + 150) / 75 / 60), (byte)((pos + 150) / 75 % 60), (byte)((pos + 150) % 75)); public void ReconstructPrefix(ref byte[] sector, // must point to a full 2352-byte sector TrackType type, long lba) @@ -218,7 +218,7 @@ namespace Aaru.Decoders.CD for(minor = 0; minor < minorCount; minor++) { - byte temp = idx < 4 ? address[idx + addressOffset] : data[(idx + dataOffset) - 4]; + byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4]; idx += minorInc; if(idx >= size) diff --git a/CD/Subchannel.cs b/CD/Subchannel.cs index eb715d6bf..75856b94a 100644 --- a/CD/Subchannel.cs +++ b/CD/Subchannel.cs @@ -71,17 +71,17 @@ namespace Aaru.Decoders.CD if((q[0] & 0xF) == 1 || (q[0] & 0xF) == 5) { - q[1] = (byte)(((q[1] / 16) * 10) + (q[1] & 0x0F)); - q[2] = (byte)(((q[2] / 16) * 10) + (q[2] & 0x0F)); - q[3] = (byte)(((q[3] / 16) * 10) + (q[3] & 0x0F)); - q[4] = (byte)(((q[4] / 16) * 10) + (q[4] & 0x0F)); - q[5] = (byte)(((q[5] / 16) * 10) + (q[5] & 0x0F)); - q[6] = (byte)(((q[6] / 16) * 10) + (q[6] & 0x0F)); - q[7] = (byte)(((q[7] / 16) * 10) + (q[7] & 0x0F)); - q[8] = (byte)(((q[8] / 16) * 10) + (q[8] & 0x0F)); + q[1] = (byte)((q[1] / 16 * 10) + (q[1] & 0x0F)); + q[2] = (byte)((q[2] / 16 * 10) + (q[2] & 0x0F)); + q[3] = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F)); + q[4] = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F)); + q[5] = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F)); + q[6] = (byte)((q[6] / 16 * 10) + (q[6] & 0x0F)); + q[7] = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F)); + q[8] = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F)); } - q[9] = (byte)(((q[9] / 16) * 10) + (q[9] & 0x0F)); + q[9] = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F)); } public static byte[] ConvertQToRaw(byte[] subchannel) @@ -330,9 +330,9 @@ namespace Aaru.Decoders.CD CRC16CCITTContext.Data(subBuf, 10, out byte[] crc); bool crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11]; - long minute = (lba + 150) / 4500; - long second = ((lba + 150) % 4500) / 75; - long frame = (lba + 150) % 4500 % 75; + long minute = (lba + 150) / 4500; + long second = (lba + 150) % 4500 / 75; + long frame = (lba + 150) % 4500 % 75; string area; int control = (subBuf[0] & 0xF0) / 16; int adr = subBuf[0] & 0x0F; @@ -350,14 +350,14 @@ namespace Aaru.Decoders.CD if(bcd) BcdToBinaryQ(subBuf); - int qPos = ((subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5]) - 150; + int qPos = (subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5] - 150; byte pmin = subBuf[7]; byte psec = subBuf[8]; - int qStart = ((subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9]) - 150; - int nextPos = ((subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5]) - 150; + int qStart = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150; + int nextPos = (subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5] - 150; byte zero = subBuf[6]; - int maxOut = ((subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9]) - 150; + int maxOut = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150; bool final = subBuf[3] == 0xFF && subBuf[4] == 0xFF && subBuf[5] == 0xFF; BinaryToBcdQ(subBuf); @@ -549,7 +549,7 @@ namespace Aaru.Decoders.CD int relative; if(isPregap) - relative = (pregap + trackStart) - sector; + relative = pregap + trackStart - sector; else relative = sector - trackStart;