diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index cf72f5a87..1427af06c 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,12 @@ +2015-12-04 Natalia Portillo + + * DVD/PFI.cs: + * DVD/Enums.cs: + Added HD DVD types. + + * SCSI/Sense.cs: + Solved SCSI sense decoding. + 2015-12-04 Natalia Portillo * CD/ATIP.cs: diff --git a/DiscImageChef.Decoders/DVD/Enums.cs b/DiscImageChef.Decoders/DVD/Enums.cs index da893b546..db5b6dfd2 100644 --- a/DiscImageChef.Decoders/DVD/Enums.cs +++ b/DiscImageChef.Decoders/DVD/Enums.cs @@ -59,6 +59,22 @@ namespace DiscImageChef.Decoders.DVD /// DVDRW = 3, /// + /// HD DVD-ROM + /// + HDDVDROM = 4, + /// + /// HD DVD-RAM + /// + HDDVDRAM = 5, + /// + /// HD DVD-R + /// + HDDVDR = 6, + /// + /// HD DVD-RW + /// + HDDVDRW = 7, + /// /// UMD. Version 0 is ECMA-365. /// UMD = 8, diff --git a/DiscImageChef.Decoders/DVD/PFI.cs b/DiscImageChef.Decoders/DVD/PFI.cs index a0dbd908f..d9c1021b0 100644 --- a/DiscImageChef.Decoders/DVD/PFI.cs +++ b/DiscImageChef.Decoders/DVD/PFI.cs @@ -1483,6 +1483,18 @@ namespace DiscImageChef.Decoders.DVD else goto default; break; + case DiskCategory.HDDVDROM: + sb.AppendFormat(categorySentence, sizeString, "HD DVD-ROM", decoded.PartVersion).AppendLine(); + break; + case DiskCategory.HDDVDRAM: + sb.AppendFormat(categorySentence, sizeString, "HD DVD-RAM", decoded.PartVersion).AppendLine(); + break; + case DiskCategory.HDDVDR: + sb.AppendFormat(categorySentence, sizeString, "HD DVD-R", decoded.PartVersion).AppendLine(); + break; + case DiskCategory.HDDVDRW: + sb.AppendFormat(categorySentence, sizeString, "HD DVD-RW", decoded.PartVersion).AppendLine(); + break; default: sb.AppendFormat(categorySentence, sizeString, "unknown disc type", decoded.PartVersion).AppendLine(); break; diff --git a/DiscImageChef.Decoders/SCSI/Sense.cs b/DiscImageChef.Decoders/SCSI/Sense.cs index d058a1391..51a196c96 100644 --- a/DiscImageChef.Decoders/SCSI/Sense.cs +++ b/DiscImageChef.Decoders/SCSI/Sense.cs @@ -304,7 +304,7 @@ namespace DiscImageChef.Decoders.SCSI decoded.Information = (uint)((sense[3] << 24) + (sense[4] << 16) + (sense[5] << 8) + sense[6]); decoded.AdditionalLength = sense[7]; - if (sense.Length != decoded.AdditionalLength + 8) + if (sense.Length < decoded.AdditionalLength + 8) return decoded; if(sense.Length >= 12)