* DiscImageChef.Decoders/SCSI/Modes.cs:

Added DDS-2.
	Corrected casting of density enumeration.

	* DiscImageChef.Decoders/SCSI/Types.cs:
	  Added DDS-2

	* DiscImageChef.Devices/Device/ScsiCommands/SPC.cs:
	  Corrected buffer size for MODE SENSE (6)

	* DiscImageChef/Commands/DeviceInfo.cs:
	  Removed some spurious brackets.
This commit is contained in:
2016-10-10 23:58:35 +01:00
parent 841453e1fa
commit 12daf68c1f
7 changed files with 72 additions and 53 deletions

View File

@@ -600,8 +600,11 @@ namespace DiscImageChef.Decoders.SCSI
case DensityType.AIT3:
density = "AIT-3";
break;
case DensityType.DDS2:
density = "DDS-2";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -623,7 +626,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5 WORM";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -636,7 +639,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -649,7 +652,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-2";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -665,7 +668,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS-3";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -681,7 +684,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS-4";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -694,7 +697,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DAT-72";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -708,7 +711,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-3";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -721,7 +724,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS cleaning cartridge";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -735,7 +738,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-4";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -749,7 +752,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -763,7 +766,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-6";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -777,7 +780,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-7";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -799,7 +802,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5 in CD emulation mode";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -833,7 +836,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VXA-1";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -876,7 +879,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VXA-3";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -914,7 +917,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape III compressed";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -946,7 +949,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape IIIxt compressed";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1000,7 +1003,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape IV at 98250 bpi compressed";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1039,7 +1042,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Super DLTtape I at 133000 bpi compressed";
break;*/
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1052,7 +1055,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Super DLTtape II";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1069,7 +1072,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VStape I compressed";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1082,7 +1085,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape S4";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1104,7 +1107,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "EXB-8500 compressed";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1129,7 +1132,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1154,7 +1157,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1179,7 +1182,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1201,7 +1204,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth-2";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1214,7 +1217,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DC-2900SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1227,7 +1230,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DC-9250";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1240,7 +1243,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-32";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1253,7 +1256,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "MRL1-26GBSL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1266,7 +1269,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-50";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1279,7 +1282,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-50 SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1292,7 +1295,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-32 SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1305,7 +1308,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-5";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1318,7 +1321,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-5 SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1331,7 +1334,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-7";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1344,7 +1347,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-7 SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1357,7 +1360,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-24";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1370,7 +1373,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-24 SL";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1383,7 +1386,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-140";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1396,7 +1399,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-40";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1409,7 +1412,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-60 or SLRtape-75";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1422,7 +1425,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-100";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
@@ -1435,13 +1438,13 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR40, SLR60 or SLR100";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
}
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
@@ -1583,7 +1586,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "ANSI X3.200: 356 mm double-sided optical disc with 56350 tracks";
break;
default:
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}