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

REFACTOR: Convert 'if' statement to 'switch' statement.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 04:43:29 +00:00
parent 090318d1b0
commit 3523d83424
6 changed files with 601 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
CD/ATIP.cs
View File

@@ -457,15 +457,19 @@ namespace DiscImageChef.Decoders.CD
switch(sec)
{
case 15:
if(frm == 00) return "TDK Corporation";
if(frm == 10) return "Ritek Co.";
if(frm == 20) return "Mitsubishi Chemical Corporation";
if(frm == 30) return "NAN-YA Plastics Corporation";
switch(frm) {
case 00: return "TDK Corporation";
case 10: return "Ritek Co.";
case 20: return "Mitsubishi Chemical Corporation";
case 30: return "NAN-YA Plastics Corporation";
}
break;
case 16:
if(frm == 20) return "Shenzen SG&Gast Digital Optical Discs";
if(frm == 30) return "Grand Advance Technology Ltd.";
switch(frm) {
case 20: return "Shenzen SG&Gast Digital Optical Discs";
case 30: return "Grand Advance Technology Ltd.";
}
break;
case 17:
@@ -473,8 +477,10 @@ namespace DiscImageChef.Decoders.CD
break;
case 18:
if(frm == 10) return "Wealth Fair Investment Ltd.";
if(frm == 60) return "Taroko International Co. Ltd.";
switch(frm) {
case 10: return "Wealth Fair Investment Ltd.";
case 60: return "Taroko International Co. Ltd.";
}
break;
case 20:
@@ -482,88 +488,106 @@ namespace DiscImageChef.Decoders.CD
break;
case 21:
if(frm == 10) return "Grupo Condor S.L.";
if(frm == 30) return "Bestdisc Technology Corporation";
if(frm == 40) return "Optical Disc Manufacturing Equipment";
if(frm == 50) return "Sound Sound Multi-Media Development Ltd.";
switch(frm) {
case 10: return "Grupo Condor S.L.";
case 30: return "Bestdisc Technology Corporation";
case 40: return "Optical Disc Manufacturing Equipment";
case 50: return "Sound Sound Multi-Media Development Ltd.";
}
break;
case 22:
if(frm == 00) return "Woongjin Media Corp.";
if(frm == 10) return "Seantram Technology Inc.";
if(frm == 20) return "Advanced Digital Media";
if(frm == 30) return "EXIMPO";
if(frm == 40) return "CIS Technology Inc.";
if(frm == 50) return "Hong Kong Digital Technology Co., Ltd.";
if(frm == 60) return "Acer Media Technology, Inc.";
switch(frm) {
case 00: return "Woongjin Media Corp.";
case 10: return "Seantram Technology Inc.";
case 20: return "Advanced Digital Media";
case 30: return "EXIMPO";
case 40: return "CIS Technology Inc.";
case 50: return "Hong Kong Digital Technology Co., Ltd.";
case 60: return "Acer Media Technology, Inc.";
}
break;
case 23:
if(frm == 00) return "Matsushita Electric Industrial Co., Ltd.";
if(frm == 10) return "Doremi Media Co., Ltd.";
if(frm == 20) return "Nacar Media s.r.l.";
if(frm == 30) return "Audio Distributors Co., Ltd.";
if(frm == 40) return "Victor Company of Japan, Ltd.";
if(frm == 50) return "Optrom Inc.";
if(frm == 60) return "Customer Pressing Oosterhout";
switch(frm) {
case 00: return "Matsushita Electric Industrial Co., Ltd.";
case 10: return "Doremi Media Co., Ltd.";
case 20: return "Nacar Media s.r.l.";
case 30: return "Audio Distributors Co., Ltd.";
case 40: return "Victor Company of Japan, Ltd.";
case 50: return "Optrom Inc.";
case 60: return "Customer Pressing Oosterhout";
}
break;
case 24:
if(frm == 00) return "Taiyo Yuden Company Ltd.";
if(frm == 10) return "SONY Corporation";
if(frm == 20) return "Computer Support Italy s.r.l.";
if(frm == 30) return "Unitech Japan Inc.";
if(frm == 40) return "kdg mediatech AG";
if(frm == 50) return "Guann Yinn Co., Ltd.";
if(frm == 60) return "Harmonic Hall Optical Disc Ltd.";
switch(frm) {
case 00: return "Taiyo Yuden Company Ltd.";
case 10: return "SONY Corporation";
case 20: return "Computer Support Italy s.r.l.";
case 30: return "Unitech Japan Inc.";
case 40: return "kdg mediatech AG";
case 50: return "Guann Yinn Co., Ltd.";
case 60: return "Harmonic Hall Optical Disc Ltd.";
}
break;
case 25:
if(frm == 00) return "MPO";
if(frm == 20) return "Hitachi Maxell, Ltd.";
if(frm == 30) return "Infodisc Technology Co. Ltd.";
if(frm == 40) return "Vivastar AG";
if(frm == 50) return "AMS Technology Inc.";
if(frm == 60) return "Xcitec Inc.";
switch(frm) {
case 00: return "MPO";
case 20: return "Hitachi Maxell, Ltd.";
case 30: return "Infodisc Technology Co. Ltd.";
case 40: return "Vivastar AG";
case 50: return "AMS Technology Inc.";
case 60: return "Xcitec Inc.";
}
break;
case 26:
if(frm == 00) return "Fornet International Pte Ltd.";
if(frm == 10) return "POSTECH Corporation";
if(frm == 20) return "SKC Co., Ltd.";
if(frm == 30) return "Optical Disc Corporation";
if(frm == 40) return "FUJI Photo Film Co., Ltd.";
if(frm == 50) return "Lead Data Inc.";
if(frm == 60) return "CMC Magnetics Corporation";
switch(frm) {
case 00: return "Fornet International Pte Ltd.";
case 10: return "POSTECH Corporation";
case 20: return "SKC Co., Ltd.";
case 30: return "Optical Disc Corporation";
case 40: return "FUJI Photo Film Co., Ltd.";
case 50: return "Lead Data Inc.";
case 60: return "CMC Magnetics Corporation";
}
break;
case 27:
if(frm == 00) return "Digital Storage Technology Co., Ltd.";
if(frm == 10) return "Plasmon Data systems Ltd.";
if(frm == 20) return "Princo Corporation";
if(frm == 30) return "Pioneer Video Corporation";
if(frm == 40) return "Kodak Japan Ltd.";
if(frm == 50) return "Mitsui Chemicals, Inc.";
if(frm == 60) return "Ricoh Company Ltd.";
switch(frm) {
case 00: return "Digital Storage Technology Co., Ltd.";
case 10: return "Plasmon Data systems Ltd.";
case 20: return "Princo Corporation";
case 30: return "Pioneer Video Corporation";
case 40: return "Kodak Japan Ltd.";
case 50: return "Mitsui Chemicals, Inc.";
case 60: return "Ricoh Company Ltd.";
}
break;
case 28:
if(frm == 00) return "Opti.Me.S. S.p.A.";
if(frm == 10) return "Gigastore Corporation";
if(frm == 20) return "Multi Media Masters & Machinary SA";
if(frm == 30) return "Auvistar Industry Co., Ltd.";
if(frm == 40) return "King Pro Mediatek Inc.";
if(frm == 50) return "Delphi Technology Inc.";
if(frm == 60) return "Friendly CD-Tek Co.";
switch(frm) {
case 00: return "Opti.Me.S. S.p.A.";
case 10: return "Gigastore Corporation";
case 20: return "Multi Media Masters & Machinary SA";
case 30: return "Auvistar Industry Co., Ltd.";
case 40: return "King Pro Mediatek Inc.";
case 50: return "Delphi Technology Inc.";
case 60: return "Friendly CD-Tek Co.";
}
break;
case 29:
if(frm == 00) return "Taeil Media Co., Ltd.";
if(frm == 10) return "Vanguard Disc Inc.";
if(frm == 20) return "Unidisc Technology Co., Ltd.";
if(frm == 30) return "Hile Optical Disc Technology Corp.";
if(frm == 40) return "Viva Magnetics Ltd.";
if(frm == 50) return "General Magnetics Ltd.";
switch(frm) {
case 00: return "Taeil Media Co., Ltd.";
case 10: return "Vanguard Disc Inc.";
case 20: return "Unidisc Technology Co., Ltd.";
case 30: return "Hile Optical Disc Technology Corp.";
case 40: return "Viva Magnetics Ltd.";
case 50: return "General Magnetics Ltd.";
}
break;
case 30:
@@ -571,13 +595,17 @@ namespace DiscImageChef.Decoders.CD
break;
case 31:
if(frm == 00) return "Ritek Co.";
if(frm == 30) return "Grand Advance Technology Ltd.";
switch(frm) {
case 00: return "Ritek Co.";
case 30: return "Grand Advance Technology Ltd.";
}
break;
case 32:
if(frm == 00) return "TDK Corporation";
if(frm == 10) return "Prodisc Technology Inc.";
switch(frm) {
case 00: return "TDK Corporation";
case 10: return "Prodisc Technology Inc.";
}
break;
case 34:
@@ -589,61 +617,75 @@ namespace DiscImageChef.Decoders.CD
break;
case 45:
if(frm == 00) return "Fornet International Pte Ltd.";
if(frm == 10) return "Unitech Japan Inc.";
if(frm == 20) return "Acer Media Technology, Inc.";
if(frm == 40) return "CIS Technology Inc.";
if(frm == 50) return "Guann Yinn Co., Ltd.";
if(frm == 60) return "Xcitec Inc.";
switch(frm) {
case 00: return "Fornet International Pte Ltd.";
case 10: return "Unitech Japan Inc.";
case 20: return "Acer Media Technology, Inc.";
case 40: return "CIS Technology Inc.";
case 50: return "Guann Yinn Co., Ltd.";
case 60: return "Xcitec Inc.";
}
break;
case 46:
if(frm == 00) return "Taiyo Yuden Company Ltd.";
if(frm == 10) return "Hong Kong Digital Technology Co., Ltd.";
if(frm == 20) return "Multi Media Masters & Machinary SA";
if(frm == 30) return "Computer Support Italy s.r.l.";
if(frm == 40) return "FUJI Photo Film Co., Ltd.";
if(frm == 50) return "Auvistar Industry Co., Ltd.";
if(frm == 60) return "CMC Magnetics Corporation";
switch(frm) {
case 00: return "Taiyo Yuden Company Ltd.";
case 10: return "Hong Kong Digital Technology Co., Ltd.";
case 20: return "Multi Media Masters & Machinary SA";
case 30: return "Computer Support Italy s.r.l.";
case 40: return "FUJI Photo Film Co., Ltd.";
case 50: return "Auvistar Industry Co., Ltd.";
case 60: return "CMC Magnetics Corporation";
}
break;
case 47:
if(frm == 10) return "Hitachi Maxell, Ltd.";
if(frm == 20) return "Princo Corporation";
if(frm == 40) return "POSTECH Corporation";
if(frm == 50) return "Ritek Co.";
if(frm == 60) return "Prodisc Technology Inc.";
switch(frm) {
case 10: return "Hitachi Maxell, Ltd.";
case 20: return "Princo Corporation";
case 40: return "POSTECH Corporation";
case 50: return "Ritek Co.";
case 60: return "Prodisc Technology Inc.";
}
break;
case 48:
if(frm == 00) return "Ricoh Company Ltd.";
if(frm == 10) return "Kodak Japan Ltd.";
if(frm == 20) return "Plasmon Data systems Ltd.";
if(frm == 30) return "Pioneer Video Corporation";
if(frm == 40) return "Digital Storage Technology Co., Ltd.";
if(frm == 50) return "Mitsui Chemicals, Inc.";
if(frm == 60) return "Lead Data Inc.";
switch(frm) {
case 00: return "Ricoh Company Ltd.";
case 10: return "Kodak Japan Ltd.";
case 20: return "Plasmon Data systems Ltd.";
case 30: return "Pioneer Video Corporation";
case 40: return "Digital Storage Technology Co., Ltd.";
case 50: return "Mitsui Chemicals, Inc.";
case 60: return "Lead Data Inc.";
}
break;
case 49:
if(frm == 00) return "TDK Corporation";
if(frm == 10) return "Gigastore Corporation";
if(frm == 20) return "King Pro Mediatek Inc.";
if(frm == 30) return "Opti.Me.S. S.p.A.";
if(frm == 40) return "Victor Company of Japan, Ltd.";
if(frm == 60) return "Matsushita Electric Industrial Co., Ltd.";
switch(frm) {
case 00: return "TDK Corporation";
case 10: return "Gigastore Corporation";
case 20: return "King Pro Mediatek Inc.";
case 30: return "Opti.Me.S. S.p.A.";
case 40: return "Victor Company of Japan, Ltd.";
case 60: return "Matsushita Electric Industrial Co., Ltd.";
}
break;
case 50:
if(frm == 10) return "Vanguard Disc Inc.";
if(frm == 20) return "Mitsubishi Chemical Corporation";
if(frm == 30) return "CDA Datenträger Albrechts GmbH";
switch(frm) {
case 10: return "Vanguard Disc Inc.";
case 20: return "Mitsubishi Chemical Corporation";
case 30: return "CDA Datenträger Albrechts GmbH";
}
break;
case 51:
if(frm == 10) return "Grand Advance Technology Ltd.";
if(frm == 20) return "Infodisc Technology Co. Ltd.";
if(frm == 50) return "Hile Optical Disc Technology Corp.";
switch(frm) {
case 10: return "Grand Advance Technology Ltd.";
case 20: return "Infodisc Technology Co. Ltd.";
case 50: return "Hile Optical Disc Technology Corp.";
}
break;
}

98
DVD/PFI.cs
View File

@@ -1078,12 +1078,12 @@ namespace DiscImageChef.Decoders.DVD
pfi.Layer0EndPSN = (uint)((response[16] << 24) + (response[17] << 16) + (response[18] << 8) + response[19]);
pfi.BCA |= (response[20] & 0x80) == 0x80;
switch(pfi.DiskCategory) {
// UMD
if(pfi.DiskCategory == DiskCategory.UMD) pfi.MediaAttribute = (ushort)((response[21] << 8) + response[22]);
case DiskCategory.UMD: pfi.MediaAttribute = (ushort)((response[21] << 8) + response[22]);
break;
// DVD-RAM
if(pfi.DiskCategory == DiskCategory.DVDRAM)
{
case DiskCategory.DVDRAM:
pfi.DiscType = (DVDRAMDiscType)response[36];
if(pfi.PartVersion == 1)
@@ -1176,21 +1176,17 @@ namespace DiscImageChef.Decoders.DVD
pfi.PowerRatioLandThreshold6T = response[626];
pfi.PowerRatioGrooveThreshold6T = response[627];
}
}
break;
// DVD-R and DVD-RW
if(pfi.DiskCategory == DiskCategory.DVDR && pfi.PartVersion < 6 ||
pfi.DiskCategory == DiskCategory.DVDRW && pfi.PartVersion < 3)
{
case DiskCategory.DVDR when pfi.PartVersion < 6:
case DiskCategory.DVDRW when pfi.PartVersion < 3:
pfi.CurrentBorderOutSector =
(uint)((response[36] << 24) + (response[37] << 16) + (response[38] << 8) + response[39]);
pfi.NextBorderInSector =
(uint)((response[40] << 24) + (response[41] << 16) + (response[42] << 8) + response[43]);
}
break;
// DVD+RW
if(pfi.DiskCategory == DiskCategory.DVDPRW)
{
case DiskCategory.DVDPRW:
pfi.RecordingVelocity = response[36];
pfi.ReadPowerMaxVelocity = response[37];
pfi.PIndMaxVelocity = response[38];
@@ -1210,6 +1206,7 @@ namespace DiscImageChef.Decoders.DVD
pfi.E1MinVelocity = response[52];
pfi.E2MinVelocity = response[53];
pfi.YTargetMinVelocity = response[54];
break;
}
// DVD+R, DVD+RW, DVD+R DL and DVD+RW DL
@@ -1230,19 +1227,18 @@ namespace DiscImageChef.Decoders.DVD
pfi.PFIUsedInADIP = response[35];
}
switch(pfi.DiskCategory) {
// DVD+RW
if(pfi.DiskCategory == DiskCategory.DVDPRW && pfi.PartVersion == 2)
{
case DiskCategory.DVDPRW when pfi.PartVersion == 2:
pfi.TopFirstPulseDuration = response[55];
pfi.MultiPulseDuration = response[56];
pfi.FirstPulseLeadTime = response[57];
pfi.EraseLeadTimeRefVelocity = response[58];
pfi.EraseLeadTimeUppVelocity = response[59];
}
break;
// DVD+R and DVD+R DL
if(pfi.DiskCategory == DiskCategory.DVDPR || pfi.DiskCategory == DiskCategory.DVDPRDL)
{
case DiskCategory.DVDPR:
case DiskCategory.DVDPRDL:
pfi.PrimaryVelocity = response[36];
pfi.UpperVelocity = response[37];
pfi.Wavelength = response[38];
@@ -1267,14 +1263,15 @@ namespace DiscImageChef.Decoders.DVD
pfi.FirstPulseLeadTime4TUpperVelocity = response[57];
pfi.FirstPulseLeadTime3TUpperVelocity = response[58];
pfi.FirstPulseLeadingEdgeUpperVelocity = response[59];
break;
}
switch(pfi.DiskCategory) {
// DVD+R DL
if(pfi.DiskCategory == DiskCategory.DVDPRDL) pfi.LayerStructure = (DVDLayerStructure)((response[34] & 0xC0) >> 6);
case DiskCategory.DVDPRDL: pfi.LayerStructure = (DVDLayerStructure)((response[34] & 0xC0) >> 6);
break;
// DVD+RW DL
if(pfi.DiskCategory == DiskCategory.DVDPRWDL)
{
case DiskCategory.DVDPRWDL:
pfi.BasicPrimaryVelocity = response[36];
pfi.MaxReadPowerPrimaryVelocity = response[37];
pfi.PindPrimaryVelocity = response[38];
@@ -1293,12 +1290,10 @@ namespace DiscImageChef.Decoders.DVD
pfi.ErasePulseLeadTimeAny = response[53];
pfi.ErasePulseLeadTime3T = response[54];
pfi.ErasePulseLeadTime4T = response[55];
}
break;
// DVD-R DL and DVD-RW DL
if(pfi.DiskCategory == DiskCategory.DVDR && pfi.PartVersion == 6 ||
pfi.DiskCategory == DiskCategory.DVDRW && pfi.PartVersion == 3)
{
case DiskCategory.DVDR when pfi.PartVersion == 6:
case DiskCategory.DVDRW when pfi.PartVersion == 3:
pfi.MaxRecordingSpeed = (DVDRecordingSpeed)response[21];
pfi.MinRecordingSpeed = (DVDRecordingSpeed)response[22];
pfi.RecordingSpeed1 = (DVDRecordingSpeed)response[23];
@@ -1319,6 +1314,7 @@ namespace DiscImageChef.Decoders.DVD
pfi.PreRecordedLeadOut |= (response[44] & 0x08) == 0x08;
pfi.ARCharLayer1 = (byte)(response[45] & 0x0F);
pfi.TrackPolarityLayer1 = (byte)((response[45] & 0xF0) >> 4);
break;
}
return pfi;
@@ -1351,10 +1347,13 @@ namespace DiscImageChef.Decoders.DVD
{
case DiskCategory.DVDROM:
sb.AppendFormat(categorySentence, sizeString, "DVD-ROM", decoded.PartVersion).AppendLine();
if(decoded.DiscSize == DVDSize.OneTwenty && decoded.PartVersion == 1)
sb.AppendLine("Disc claims conformation to ECMA-267");
if(decoded.DiscSize == DVDSize.Eighty && decoded.PartVersion == 1)
sb.AppendLine("Disc claims conformation to ECMA-268");
switch(decoded.DiscSize) {
case DVDSize.OneTwenty when decoded.PartVersion == 1: sb.AppendLine("Disc claims conformation to ECMA-267");
break;
case DVDSize.Eighty when decoded.PartVersion == 1: sb.AppendLine("Disc claims conformation to ECMA-268");
break;
}
break;
case DiskCategory.DVDRAM:
sb.AppendFormat(categorySentence, sizeString, "DVD-RAM", decoded.PartVersion).AppendLine();
@@ -1580,11 +1579,10 @@ namespace DiscImageChef.Decoders.DVD
if(decoded.BCA) sb.AppendLine("Disc has a burst cutting area");
if(decoded.DiskCategory == DiskCategory.UMD)
sb.AppendFormat("Media attribute is {0}", decoded.MediaAttribute).AppendLine();
if(decoded.DiskCategory == DiskCategory.DVDRAM)
{
switch(decoded.DiskCategory) {
case DiskCategory.UMD: sb.AppendFormat("Media attribute is {0}", decoded.MediaAttribute).AppendLine();
break;
case DiskCategory.DVDRAM:
switch(decoded.DiscType)
{
case DVDRAMDiscType.Cased:
@@ -1604,29 +1602,28 @@ namespace DiscImageChef.Decoders.DVD
sb.AppendFormat("Disc manufacturer supplementary information is {0}",
decoded.DiskManufacturerSupplementary).AppendLine();
}
}
if(decoded.DiskCategory == DiskCategory.DVDR && decoded.PartVersion < 6 ||
decoded.DiskCategory == DiskCategory.DVDRW && decoded.PartVersion < 3)
{
break;
case DiskCategory.DVDR when decoded.PartVersion < 6:
case DiskCategory.DVDRW when decoded.PartVersion < 3:
sb.AppendFormat("Current Border-Out first sector is PSN {0:X}h", decoded.CurrentBorderOutSector)
.AppendLine();
sb.AppendFormat("Next Border-In first sector is PSN {0:X}h", decoded.NextBorderInSector).AppendLine();
}
if(decoded.DiskCategory == DiskCategory.DVDPR || decoded.DiskCategory == DiskCategory.DVDPRW ||
decoded.DiskCategory == DiskCategory.DVDPRDL || decoded.DiskCategory == DiskCategory.DVDPRWDL)
{
break;
case DiskCategory.DVDPR:
case DiskCategory.DVDPRW:
case DiskCategory.DVDPRDL:
case DiskCategory.DVDPRWDL:
if(decoded.VCPS) sb.AppendLine("Disc contains extended information for VCPS");
sb.AppendFormat("Disc application code is {0}", decoded.ApplicationCode).AppendLine();
sb.AppendFormat("Disc manufacturer is {0}", decoded.DiskManufacturerID).AppendLine();
sb.AppendFormat("Disc media type is {0}", decoded.MediaTypeID).AppendLine();
sb.AppendFormat("Disc product revision is {0}", decoded.ProductRevision).AppendLine();
break;
}
if(decoded.DiskCategory == DiskCategory.DVDR && decoded.PartVersion >= 6 ||
decoded.DiskCategory == DiskCategory.DVDRW && decoded.PartVersion >= 3)
{
if((decoded.DiskCategory != DiskCategory.DVDR || decoded.PartVersion < 6) &&
(decoded.DiskCategory != DiskCategory.DVDRW || decoded.PartVersion < 3)) return sb.ToString();
sb.AppendFormat("Current RMD in extra Border zone starts at PSN {0:X}h",
decoded.CurrentRMDExtraBorderPSN).AppendLine();
sb.AppendFormat("PFI in extra Border zone starts at PSN {0:X}h", decoded.PFIExtraBorderPSN)
@@ -1634,7 +1631,6 @@ namespace DiscImageChef.Decoders.DVD
if(!decoded.PreRecordedControlDataInv) sb.AppendLine("Control Data Zone is pre-recorded");
if(decoded.PreRecordedLeadIn) sb.AppendLine("Lead-In is pre-recorded");
if(decoded.PreRecordedLeadOut) sb.AppendLine("Lead-Out is pre-recorded");
}
return sb.ToString();
}

66
SCSI/EVPD.cs
View File

@@ -407,11 +407,14 @@ namespace DiscImageChef.Decoders.SCSI
if(descriptor.Length + position + 4 >= pageResponse.Length)
descriptor.Length = (byte)(pageResponse.Length - position - 4);
Array.Copy(pageResponse, position + 4, descriptor.Binary, 0, descriptor.Length);
if(descriptor.CodeSet == IdentificationCodeSet.ASCII)
descriptor.ASCII = StringHandlers.CToString(descriptor.Binary);
else if(descriptor.CodeSet == IdentificationCodeSet.UTF8)
descriptor.ASCII = Encoding.UTF8.GetString(descriptor.Binary);
else descriptor.ASCII = "";
switch(descriptor.CodeSet) {
case IdentificationCodeSet.ASCII: descriptor.ASCII = StringHandlers.CToString(descriptor.Binary);
break;
case IdentificationCodeSet.UTF8: descriptor.ASCII = Encoding.UTF8.GetString(descriptor.Binary);
break;
default: descriptor.ASCII = "";
break;
}
position += 4 + descriptor.Length;
descriptors.Add(descriptor);
@@ -516,29 +519,37 @@ namespace DiscImageChef.Decoders.SCSI
switch(descriptor.Type)
{
case IdentificationTypes.NoAuthority:
if(descriptor.CodeSet == IdentificationCodeSet.ASCII ||
descriptor.CodeSet == IdentificationCodeSet.UTF8)
sb.AppendFormat("\tVendor descriptor contains: {0}", descriptor.ASCII).AppendLine();
else if(descriptor.CodeSet == IdentificationCodeSet.Binary)
switch(descriptor.CodeSet) {
case IdentificationCodeSet.ASCII:
case IdentificationCodeSet.UTF8: sb.AppendFormat("\tVendor descriptor contains: {0}", descriptor.ASCII).AppendLine();
break;
case IdentificationCodeSet.Binary:
sb.AppendFormat("\tVendor descriptor contains binary data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40)).AppendLine();
else
break;
default:
sb.AppendFormat("\tVendor descriptor contains unknown kind {1} of data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40),
(byte)descriptor.CodeSet).AppendLine();
break;
}
break;
case IdentificationTypes.Inquiry:
if(descriptor.CodeSet == IdentificationCodeSet.ASCII ||
descriptor.CodeSet == IdentificationCodeSet.UTF8)
sb.AppendFormat("\tInquiry descriptor contains: {0}", descriptor.ASCII).AppendLine();
else if(descriptor.CodeSet == IdentificationCodeSet.Binary)
switch(descriptor.CodeSet) {
case IdentificationCodeSet.ASCII:
case IdentificationCodeSet.UTF8: sb.AppendFormat("\tInquiry descriptor contains: {0}", descriptor.ASCII).AppendLine();
break;
case IdentificationCodeSet.Binary:
sb.AppendFormat("\tInquiry descriptor contains binary data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40)).AppendLine();
else
break;
default:
sb.AppendFormat("\tInquiry descriptor contains unknown kind {1} of data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40),
(byte)descriptor.CodeSet).AppendLine();
break;
}
break;
case IdentificationTypes.EUI:
if(descriptor.CodeSet == IdentificationCodeSet.ASCII ||
descriptor.CodeSet == IdentificationCodeSet.UTF8)
@@ -705,20 +716,26 @@ namespace DiscImageChef.Decoders.SCSI
break;
default:
if(descriptor.CodeSet == IdentificationCodeSet.ASCII ||
descriptor.CodeSet == IdentificationCodeSet.UTF8)
switch(descriptor.CodeSet) {
case IdentificationCodeSet.ASCII:
case IdentificationCodeSet.UTF8:
sb.AppendFormat("\tUnknown descriptor type {1} contains: {0}", descriptor.ASCII,
(byte)descriptor.Type).AppendLine();
else if(descriptor.CodeSet == IdentificationCodeSet.Binary)
break;
case IdentificationCodeSet.Binary:
sb.AppendFormat("\tUnknown descriptor type {1} contains binary data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40),
(byte)descriptor.Type).AppendLine();
else
break;
default:
sb.AppendFormat("Inquiry descriptor type {2} contains unknown kind {1} of data (hex): {0}",
PrintHex.ByteArrayToHexArrayString(descriptor.Binary, 40),
(byte)descriptor.CodeSet, (byte)descriptor.Type).AppendLine();
break;
}
break;
}
}
return sb.ToString();
@@ -1205,8 +1222,9 @@ namespace DiscImageChef.Decoders.SCSI
sb.AppendLine("SCSI Extended INQUIRY Data:");
if(page.PeripheralDeviceType == PeripheralDeviceTypes.DirectAccess ||
page.PeripheralDeviceType == PeripheralDeviceTypes.SCSIZonedBlockDevice)
switch(page.PeripheralDeviceType) {
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.SCSIZonedBlockDevice:
switch(page.SPT)
{
case 0:
@@ -1235,8 +1253,10 @@ namespace DiscImageChef.Decoders.SCSI
.AppendLine();
break;
}
else if(page.PeripheralDeviceType == PeripheralDeviceTypes.SequentialAccess && page.SPT == 1)
sb.AppendLine("Logical unit supports logical block protection");
break;
case PeripheralDeviceTypes.SequentialAccess when page.SPT == 1: sb.AppendLine("Logical unit supports logical block protection");
break;
}
if(page.GRD_CHK) sb.AppendLine("Device checks the logical block guard");
if(page.APP_CHK) sb.AppendLine("Device checks the logical block application tag");

45
SCSI/Modes/Mode10.cs
View File

@@ -100,27 +100,24 @@ namespace DiscImageChef.Decoders.SCSI
}
}
if(deviceType == PeripheralDeviceTypes.DirectAccess || deviceType == PeripheralDeviceTypes.MultiMediaDevice)
{
switch(deviceType) {
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.MultiMediaDevice:
header.WriteProtected = (modeResponse[3] & 0x80) == 0x80;
header.DPOFUA = (modeResponse[3] & 0x10) == 0x10;
}
if(deviceType == PeripheralDeviceTypes.SequentialAccess)
{
break;
case PeripheralDeviceTypes.SequentialAccess:
header.WriteProtected = (modeResponse[3] & 0x80) == 0x80;
header.Speed = (byte)(modeResponse[3] & 0x0F);
header.BufferedMode = (byte)((modeResponse[3] & 0x70) >> 4);
}
if(deviceType == PeripheralDeviceTypes.PrinterDevice)
header.BufferedMode = (byte)((modeResponse[3] & 0x70) >> 4);
if(deviceType == PeripheralDeviceTypes.OpticalDevice)
{
break;
case PeripheralDeviceTypes.PrinterDevice: header.BufferedMode = (byte)((modeResponse[3] & 0x70) >> 4);
break;
case PeripheralDeviceTypes.OpticalDevice:
header.WriteProtected = (modeResponse[3] & 0x80) == 0x80;
header.EBC = (modeResponse[3] & 0x01) == 0x01;
header.DPOFUA = (modeResponse[3] & 0x10) == 0x10;
break;
}
return header;
@@ -217,26 +214,24 @@ namespace DiscImageChef.Decoders.SCSI
hdr[2] = (byte)header.MediumType;
if(deviceType == PeripheralDeviceTypes.DirectAccess || deviceType == PeripheralDeviceTypes.MultiMediaDevice)
{
switch(deviceType) {
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.MultiMediaDevice:
if(header.WriteProtected) hdr[3] += 0x80;
if(header.DPOFUA) hdr[3] += 0x10;
}
if(deviceType == PeripheralDeviceTypes.SequentialAccess)
{
break;
case PeripheralDeviceTypes.SequentialAccess:
if(header.WriteProtected) hdr[3] += 0x80;
hdr[3] += (byte)(header.Speed & 0x0F);
hdr[3] += (byte)((header.BufferedMode << 4) & 0x70);
}
if(deviceType == PeripheralDeviceTypes.PrinterDevice) hdr[3] += (byte)((header.BufferedMode << 4) & 0x70);
if(deviceType == PeripheralDeviceTypes.OpticalDevice)
{
break;
case PeripheralDeviceTypes.PrinterDevice: hdr[3] += (byte)((header.BufferedMode << 4) & 0x70);
break;
case PeripheralDeviceTypes.OpticalDevice:
if(header.WriteProtected) hdr[3] += 0x80;
if(header.EBC) hdr[3] += 0x01;
if(header.DPOFUA) hdr[3] += 0x10;
break;
}
if(longLBA) hdr[4] += 0x01;

45
SCSI/Modes/Mode6.cs
View File

@@ -60,27 +60,24 @@ namespace DiscImageChef.Decoders.SCSI
}
}
if(deviceType == PeripheralDeviceTypes.DirectAccess || deviceType == PeripheralDeviceTypes.MultiMediaDevice)
{
switch(deviceType) {
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.MultiMediaDevice:
header.WriteProtected = (modeResponse[2] & 0x80) == 0x80;
header.DPOFUA = (modeResponse[2] & 0x10) == 0x10;
}
if(deviceType == PeripheralDeviceTypes.SequentialAccess)
{
break;
case PeripheralDeviceTypes.SequentialAccess:
header.WriteProtected = (modeResponse[2] & 0x80) == 0x80;
header.Speed = (byte)(modeResponse[2] & 0x0F);
header.BufferedMode = (byte)((modeResponse[2] & 0x70) >> 4);
}
if(deviceType == PeripheralDeviceTypes.PrinterDevice)
header.BufferedMode = (byte)((modeResponse[2] & 0x70) >> 4);
if(deviceType == PeripheralDeviceTypes.OpticalDevice)
{
break;
case PeripheralDeviceTypes.PrinterDevice: header.BufferedMode = (byte)((modeResponse[2] & 0x70) >> 4);
break;
case PeripheralDeviceTypes.OpticalDevice:
header.WriteProtected = (modeResponse[2] & 0x80) == 0x80;
header.EBC = (modeResponse[2] & 0x01) == 0x01;
header.DPOFUA = (modeResponse[2] & 0x10) == 0x10;
break;
}
return header;
@@ -167,26 +164,24 @@ namespace DiscImageChef.Decoders.SCSI
hdr[1] = (byte)header.MediumType;
if(deviceType == PeripheralDeviceTypes.DirectAccess || deviceType == PeripheralDeviceTypes.MultiMediaDevice)
{
switch(deviceType) {
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.MultiMediaDevice:
if(header.WriteProtected) hdr[2] += 0x80;
if(header.DPOFUA) hdr[2] += 0x10;
}
if(deviceType == PeripheralDeviceTypes.SequentialAccess)
{
break;
case PeripheralDeviceTypes.SequentialAccess:
if(header.WriteProtected) hdr[2] += 0x80;
hdr[2] += (byte)(header.Speed & 0x0F);
hdr[2] += (byte)((header.BufferedMode << 4) & 0x70);
}
if(deviceType == PeripheralDeviceTypes.PrinterDevice) hdr[2] += (byte)((header.BufferedMode << 4) & 0x70);
if(deviceType == PeripheralDeviceTypes.OpticalDevice)
{
break;
case PeripheralDeviceTypes.PrinterDevice: hdr[2] += (byte)((header.BufferedMode << 4) & 0x70);
break;
case PeripheralDeviceTypes.OpticalDevice:
if(header.WriteProtected) hdr[2] += 0x80;
if(header.EBC) hdr[2] += 0x01;
if(header.DPOFUA) hdr[2] += 0x10;
break;
}
if(header.BlockDescriptors != null)

18
Xbox/DMI.cs
View File

@@ -234,28 +234,30 @@ namespace DiscImageChef.Decoders.Xbox
sb.Append("-");
if(decoded.CatalogNumber.Length == 13)
{
switch(decoded.CatalogNumber.Length) {
case 13:
for(int i = 8; i < 10; i++) sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
sb.Append("-");
for(int i = 10; i < 13; i++) sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
}
else if(decoded.CatalogNumber.Length == 14)
{
break;
case 14:
for(int i = 8; i < 11; i++) sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
sb.Append("-");
for(int i = 11; i < 14; i++) sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
}
else
{
break;
default:
for(int i = 8; i < decoded.CatalogNumber.Length - 3; i++)
sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
sb.Append("-");
for(int i = decoded.CatalogNumber.Length - 3; i < decoded.CatalogNumber.Length; i++)
sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
break;
}
sb.AppendLine();