From a434db22bd5278e77f064b244041d30c5e05d870 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 24 Nov 2015 03:24:14 +0000 Subject: [PATCH] Reorganized media-info command so only applicable information is requested based on what we are being informed about media type. --- ChangeLog | 9 +++ DiscImageChef.Decoders.csproj | 2 - SCSI/MMC/OPW.cs | 99 -------------------------------- SCSI/MMC/TrackInformation.cs | 104 ---------------------------------- 4 files changed, 9 insertions(+), 205 deletions(-) delete mode 100644 SCSI/MMC/OPW.cs delete mode 100644 SCSI/MMC/TrackInformation.cs diff --git a/ChangeLog b/ChangeLog index 2afd564..1e4b7ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-11-24 Natalia Portillo + + * SCSI/MMC/OPW.cs: + * SCSI/MMC/TrackInformation.cs: + * DiscImageChef.Decoders.csproj: + Reorganized media-info command so only applicable + information is requested based on what we are being informed + about media type. + 2015-11-24 Natalia Portillo * SCSI/MMC/DiscInformation.cs: diff --git a/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders.csproj index 2cf746d..0061c89 100644 --- a/DiscImageChef.Decoders.csproj +++ b/DiscImageChef.Decoders.csproj @@ -73,8 +73,6 @@ - - diff --git a/SCSI/MMC/OPW.cs b/SCSI/MMC/OPW.cs deleted file mode 100644 index f80eb97..0000000 --- a/SCSI/MMC/OPW.cs +++ /dev/null @@ -1,99 +0,0 @@ -// /*************************************************************************** -// The Disc Image Chef -// ---------------------------------------------------------------------------- -// -// Filename : OPW.cs -// Version : 1.0 -// Author(s) : Natalia Portillo -// -// Component : Component -// -// Revision : $Revision$ -// Last change by : $Author$ -// Date : $Date$ -// -// --[ Description ] ---------------------------------------------------------- -// -// Description -// -// --[ License ] -------------------------------------------------------------- -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// ---------------------------------------------------------------------------- -// Copyright (C) 2011-2015 Claunia.com -// ****************************************************************************/ -// //$Id$ -using System; - -namespace DiscImageChef.Decoders.SCSI.MMC -{ - /// - /// Information from the following standards: - /// ANSI X3.304-1997 - /// T10/1048-D revision 9.0 - /// T10/1048-D revision 10a - /// T10/1228-D revision 7.0c - /// T10/1228-D revision 11a - /// T10/1363-D revision 10g - /// T10/1545-D revision 1d - /// T10/1545-D revision 5 - /// T10/1545-D revision 5a - /// T10/1675-D revision 2c - /// T10/1675-D revision 4 - /// T10/1836-D revision 2g - /// - public static class OPW - { - public struct OPWInformation - { - /// - /// Bytes 0 to 1 - /// Data length, always 14 - /// - public UInt16 DataLength; - /// - /// Byte 2, bits 7 to 5 - /// 010b - /// - public byte DataType; - /// - /// Byte 2, bits 4 to 0 - /// Reserved - /// - public byte Reserved1; - /// - /// Byte 3 - /// Reserved - /// - public byte Reserved2; - /// - /// Bytes 4 to 5 - /// Remaining POW Replacements - /// - public UInt32 RemainingReplacements; - /// - /// Bytes 6 to 7 - /// Remaining POW Reallocation Map Entries - /// - public UInt32 RemainingReallocationEntries; - /// - /// Bytes 8 to 9 - /// Number of Remaining POW Updates - /// - public UInt32 RemainingUpdates; - } - } -} - diff --git a/SCSI/MMC/TrackInformation.cs b/SCSI/MMC/TrackInformation.cs deleted file mode 100644 index f428e34..0000000 --- a/SCSI/MMC/TrackInformation.cs +++ /dev/null @@ -1,104 +0,0 @@ -// /*************************************************************************** -// The Disc Image Chef -// ---------------------------------------------------------------------------- -// -// Filename : TrackInformation.cs -// Version : 1.0 -// Author(s) : Natalia Portillo -// -// Component : Component -// -// Revision : $Revision$ -// Last change by : $Author$ -// Date : $Date$ -// -// --[ Description ] ---------------------------------------------------------- -// -// Description -// -// --[ License ] -------------------------------------------------------------- -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// ---------------------------------------------------------------------------- -// Copyright (C) 2011-2015 Claunia.com -// ****************************************************************************/ -// //$Id$ -using System; - -namespace DiscImageChef.Decoders.SCSI.MMC -{ - /// - /// Information from the following standards: - /// ANSI X3.304-1997 - /// T10/1048-D revision 9.0 - /// T10/1048-D revision 10a - /// T10/1228-D revision 7.0c - /// T10/1228-D revision 11a - /// T10/1363-D revision 10g - /// T10/1545-D revision 1d - /// T10/1545-D revision 5 - /// T10/1545-D revision 5a - /// T10/1675-D revision 2c - /// T10/1675-D revision 4 - /// T10/1836-D revision 2g - /// - public static class TrackInformation - { - public struct TrackInformationResponse - { - /// - /// Bytes 0 to 1 - /// Data length, always 10 - /// - public UInt16 DataLength; - /// - /// Byte 2, bits 7 to 5 - /// 001b - /// - public byte DataType; - /// - /// Byte 2, bits 4 to 0 - /// Reserved - /// - public byte Reserved1; - /// - /// Byte 3 - /// Reserved - /// - public byte Reserved2; - /// - /// Bytes 4 to 5 - /// Maximum possible number of tracks on the disc - /// - public UInt16 MaxTracks; - /// - /// Bytes 6 to 7 - /// Number of assigned tracks on the disc - /// - public UInt16 AssignedTracks; - /// - /// Bytes 8 to 9 - /// Maximum possible number of appendable tracks on the disc - /// - public UInt16 MaxAppendable; - /// - /// Bytes 10 to 11 - /// Current number of appendable tracks on the disc - /// - public UInt16 CurrentAppendable; - } - } -} -