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

Implemented SCSI VPDs 0x00 to 0x80.

Browse Source
This commit is contained in:
Natalia Portillo
2015-10-19 04:32:16 +01:00
parent 2a416eef37
commit ac491f6f5c
7 changed files with 242 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,9 @@
2015-10-19 Natalia Portillo <claunia@claunia.com>
* SCSI/EVPD.cs:
* DiscImageChef.Decoders.csproj:
Implemented SCSI VPDs 0x00 to 0x80.
2015-10-19 Natalia Portillo <claunia@claunia.com>
* ATA/Identify.cs:

1
DiscImageChef.Decoders/DiscImageChef.Decoders.csproj
View File

@@ -78,6 +78,7 @@
<Compile Include="SCSI\Enums.cs" />
<Compile Include="SCSI\VendorString.cs" />
<Compile Include="ATA\Identify.cs" />
<Compile Include="SCSI\EVPD.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>

115
DiscImageChef.Decoders/SCSI/EVPD.cs Normal file
View File

@@ -0,0 +1,115 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : EVPD.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 <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright (C) 2011-2015 Claunia.com
// ****************************************************************************/
// //$Id$
using System;
using DiscImageChef;
namespace DiscImageChef.Decoders.SCSI
{
public static class EVPD
{
/// <summary>
/// Decodes VPD page 0x00: Supported VPD pages
/// </summary>
/// <returns>A byte array containing all supported VPD pages.</returns>
/// <param name="page">Page 0x00.</param>
public static byte[] DecodePage00(byte[] page)
{
if (page == null)
return null;
if (page[1] != 0)
return null;
if (page.Length != page[3] + 4)
return null;
byte[] decoded = new byte[page.Length - 4];
Array.Copy(page, 4, decoded, 0, page.Length - 4);
return decoded;
}
/// <summary>
/// Decides VPD pages 0x01 to 0x7F: ASCII Information
/// </summary>
/// <returns>An ASCII string with the contents of the page.</returns>
/// <param name="page">Page 0x01-0x7F.</param>
public static string DecodeASCIIPage(byte[] page)
{
if (page == null)
return null;
if (page[1] == 0 || page[1] > 0x7F)
return null;
if (page.Length != page[3] + 4)
return null;
byte[] ascii = new byte[page[4]];
Array.Copy(page, 5, ascii, 0, page[4]);
return StringHandlers.CToString(ascii);
}
/// <summary>
/// Decodes VPD page 0x80: Unit Serial Number
/// </summary>
/// <returns>The unit serial number.</returns>
/// <param name="page">Page 0x80.</param>
public static string DecodePage80(byte[] page)
{
if (page == null)
return null;
if (page[1] != 0x80)
return null;
if (page.Length != page[3] + 4)
return null;
byte[] ascii = new byte[page.Length - 4];
Array.Copy(page, 4, ascii, 0, page.Length - 4);
return StringHandlers.CToString(ascii);
}
}
}

5
DiscImageChef.Devices/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-10-19 Natalia Portillo <claunia@claunia.com>
* Device/ScsiCommands.cs:
Implemented SCSI VPDs 0x00 to 0x80.
2015-10-18 Natalia Portillo <claunia@claunia.com>
* Device/AtaCommands.cs:

2
DiscImageChef.Devices/Device/ScsiCommands.cs
View File

@@ -174,7 +174,7 @@ namespace DiscImageChef.Devices
if (sense)
return true;
byte pagesLength = (byte)(buffer[4] + 5);
byte pagesLength = (byte)(buffer[3] + 4);
cdb = new byte[] { (byte)Enums.ScsiCommands.Inquiry, 1, page, 0, pagesLength, 0 };
buffer = new byte[pagesLength];

5
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-10-19 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs:
Implemented SCSI VPDs 0x00 to 0x80.
2015-10-19 Natalia Portillo <claunia@claunia.com>
* Commands/Decode.cs:

140
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -39,6 +39,7 @@ using System;
using DiscImageChef.Devices;
using System.IO;
using DiscImageChef.Console;
using System.Text;
namespace DiscImageChef.Commands
{
@@ -64,45 +65,35 @@ namespace DiscImageChef.Commands
return;
}
byte[] senseBuf;
byte[] inqBuf;
bool ata = false;
bool atapi = false;
bool scsi = false;
bool scsi83 = false;
bool sense = dev.ScsiInquiry(out inqBuf, out senseBuf);
string decodedAta = null;
string decodedAtapi = null;
string decodedScsi = null;
string scsiSerial = null;
if(sense)
{
DicConsole.ErrorWriteLine("SCSI error. Sense decoding not yet implemented.");
#if DEBUG
FileStream senseFs = File.Open("sense.bin", FileMode.OpenOrCreate);
senseFs.Write(senseBuf, 0, senseBuf.Length);
#endif
}
else
DicConsole.WriteLine("SCSI OK");
DicConsole.WriteLine(Decoders.SCSI.Inquiry.Prettify(inqBuf));
StringBuilder sb = null;
Structs.AtaErrorRegistersCHS errorRegisters;
byte[] ataBuf;
sense = dev.AtaIdentify(out ataBuf, out errorRegisters);
bool sense = dev.AtaIdentify(out ataBuf, out errorRegisters);
if (sense)
{
if ((errorRegisters.status & 0x01) == 0x01
&& (errorRegisters.error & 0x04) == 0x04
&& errorRegisters.cylinderHigh == 0xEB
&& errorRegisters.cylinderLow == 0x14)
&& (errorRegisters.error & 0x04) == 0x04
&& errorRegisters.cylinderHigh == 0xEB
&& errorRegisters.cylinderLow == 0x14)
{
DicConsole.WriteLine("ATA error, but ATAPI signature detected.");
sense = dev.AtapiIdentify(out ataBuf, out errorRegisters);
if (sense)
{
DicConsole.WriteLine("ATAPI error");
DicConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.status);
DicConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.error);
DicConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}", errorRegisters.sectorCount);
@@ -115,14 +106,12 @@ namespace DiscImageChef.Commands
}
else
{
DicConsole.WriteLine("ATAPI OK");
DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(ataBuf));
atapi = true;
decodedAtapi = Decoders.ATA.Identify.Prettify(ataBuf);
}
}
else
{
DicConsole.WriteLine("ATA error");
DicConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.status);
DicConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.error);
DicConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}", errorRegisters.sectorCount);
@@ -136,9 +125,98 @@ namespace DiscImageChef.Commands
}
else
{
DicConsole.WriteLine("ATA OK");
DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(ataBuf));
}
ata = true;
decodedAta = Decoders.ATA.Identify.Prettify(ataBuf);
}
if (!ata)
{
byte[] senseBuf;
byte[] inqBuf;
sense = dev.ScsiInquiry(out inqBuf, out senseBuf);
if (sense)
{
DicConsole.ErrorWriteLine("SCSI error. Sense decoding not yet implemented.");
#if DEBUG
FileStream senseFs = File.Open("sense.bin", FileMode.OpenOrCreate);
senseFs.Write(senseBuf, 0, senseBuf.Length);
#endif
}
else
{
scsi = true;
decodedScsi = Decoders.SCSI.Inquiry.Prettify(inqBuf);
sense = dev.ScsiInquiry(out inqBuf, out senseBuf, 0x00);
if (!sense)
{
byte[] pages = Decoders.SCSI.EVPD.DecodePage00(inqBuf);
foreach (byte page in pages)
{
if (page >= 0x01 && page <= 0x7F)
{
sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);
if (!sense)
{
if(sb == null)
sb = new StringBuilder();
sb.AppendFormat("Page 0x{0:X2}: ", Decoders.SCSI.EVPD.DecodeASCIIPage(inqBuf)).AppendLine();
}
}
else if (page == 0x80)
{
sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);
if (!sense)
{
scsi83 = true;
scsiSerial = Decoders.SCSI.EVPD.DecodePage80(inqBuf);
}
}
else
{
if(page != 0x00)
DicConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}", page);
}
}
}
}
if (atapi)
{
DicConsole.WriteLine(decodedAtapi);
}
else if (scsi)
{
DicConsole.WriteLine("SCSI device");
}
if(scsi)
{
DicConsole.WriteLine(decodedScsi);
if(scsi83)
DicConsole.WriteLine("Unit Serial Number: {0}", scsiSerial);
if(sb != null)
{
DicConsole.WriteLine("ASCII VPDs:");
DicConsole.WriteLine(sb.ToString());
}
}
}
else
{
DicConsole.WriteLine("ATA device");
DicConsole.WriteLine(decodedAta);
}
if(!ata && !atapi && !scsi)
DicConsole.ErrorWriteLine("Unknown device type, cannot get information.");
}
}
}