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

Added Seagate EVPD and INQUIRY fields.

Browse Source
This commit is contained in:
Natalia Portillo
2016-10-14 23:05:36 +01:00
parent e123203b0a
commit 0e808c8844
5 changed files with 173 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,8 @@
2016-10-14 Natalia Portillo <claunia@claunia.com>
* EVPD.cs:
* Inquiry.cs: Added Seagate EVPD and INQUIRY fields.
2016-10-14 Natalia Portillo <claunia@claunia.com> 2016-10-14 Natalia Portillo <claunia@claunia.com>
* Modes.cs: Added Apple OEM MODE page 30h. * Modes.cs: Added Apple OEM MODE page 30h.

87
DiscImageChef.Decoders/SCSI/EVPD.cs
View File

@@ -2333,7 +2333,7 @@ namespace DiscImageChef.Decoders.SCSI
decoded.PageLength = (byte)(pageResponse[3] + 4); decoded.PageLength = (byte)(pageResponse[3] + 4);
decoded.PageCode = pageResponse[1]; decoded.PageCode = pageResponse[1];
if(pageResponse[3] == 92 && pageResponse.Length < 96) if(pageResponse[3] == 92 && pageResponse.Length >= 96)
{ {
decoded.Component = new byte[26]; decoded.Component = new byte[26];
decoded.Version = new byte[19]; decoded.Version = new byte[19];
@@ -2449,6 +2449,91 @@ namespace DiscImageChef.Decoders.SCSI
#endregion EVPD Pages 0xC0 to 0xC5 (HP): Drive component revision level pages #endregion EVPD Pages 0xC0 to 0xC5 (HP): Drive component revision level pages
#region EVPD Page 0xC0 (Seagate): Firmware numbers page
/// <summary>
/// Firmware numbers page
/// Page code 0xC0 (Seagate)
/// </summary>
public struct Page_C0_Seagate
{
/// <summary>
/// The peripheral qualifier.
/// </summary>
public PeripheralQualifiers PeripheralQualifier;
/// <summary>
/// The type of the peripheral device.
/// </summary>
public PeripheralDeviceTypes PeripheralDeviceType;
/// <summary>
/// The page code.
/// </summary>
public byte PageCode;
/// <summary>
/// The length of the page.
/// </summary>
public byte PageLength;
public byte[] ControllerFirmware;
public byte[] BootFirmware;
public byte[] ServoFirmware;
}
public static Page_C0_Seagate? DecodePage_C0_Seagate(byte[] pageResponse)
{
if(pageResponse == null)
return null;
if(pageResponse[1] != 0xC0)
return null;
if(pageResponse[3] != 12)
return null;
if(pageResponse.Length != 16)
return null;
Page_C0_Seagate decoded = new Page_C0_Seagate();
decoded.PeripheralQualifier = (PeripheralQualifiers)((pageResponse[0] & 0xE0) >> 5);
decoded.PeripheralDeviceType = (PeripheralDeviceTypes)(pageResponse[0] & 0x1F);
decoded.PageLength = (byte)(pageResponse[3] + 4);
decoded.PageCode = pageResponse[1];
decoded.ControllerFirmware = new byte[4];
decoded.BootFirmware = new byte[4];
decoded.ServoFirmware = new byte[4];
Array.Copy(pageResponse, 4, decoded.ControllerFirmware, 0, 4);
Array.Copy(pageResponse, 8, decoded.BootFirmware, 0, 4);
Array.Copy(pageResponse, 12, decoded.ServoFirmware, 0, 4)
return decoded;
}
public static string PrettifyPage_C0_Seagate(byte[] pageResponse)
{
return PrettifyPage_C0_Seagate(DecodePage_C0_Seagate(pageResponse));
}
public static string PrettifyPage_C0_Seagate(Page_C0_Seagate? modePage)
{
if(!modePage.HasValue)
return null;
Page_C0_Seagate page = modePage.Value;
StringBuilder sb = new StringBuilder();
sb.AppendLine("Seagate Firmware Numbers page:");
sb.AppendFormat("\tController firmware version: {0}", StringHandlers.CToString(page.ControllerFirmware)).AppendLine();
sb.AppendFormat("\tBoot firmware version: {0}", StringHandlers.CToString(page.BootFirmware)).AppendLine();
sb.AppendFormat("\tServo firmware version: {0}", StringHandlers.CToString(page.ServoFirmware)).AppendLine();
return sb.ToString();
}
#endregion EVPD Page 0xC0 (Seagate): Firmware numbers page
} }
} }

68
DiscImageChef.Decoders/SCSI/Inquiry.cs
View File

@@ -143,6 +143,13 @@ namespace DiscImageChef.Decoders.SCSI
decoded.ProductRevisionLevel = new byte[4]; decoded.ProductRevisionLevel = new byte[4];
Array.Copy(SCSIInquiryResponse, 32, decoded.ProductRevisionLevel, 0, 4); Array.Copy(SCSIInquiryResponse, 32, decoded.ProductRevisionLevel, 0, 4);
} }
if(SCSIInquiryResponse.Length >= 44)
{
// Seagate 1
decoded.SeagatePresent = true;
decoded.Seagate_DriveSerialNumber = new byte[8];
Array.Copy(SCSIInquiryResponse, 36, decoded.Seagate_DriveSerialNumber, 0, 8);
}
if(SCSIInquiryResponse.Length >= 49) if(SCSIInquiryResponse.Length >= 49)
{ {
// HP // HP
@@ -225,6 +232,20 @@ namespace DiscImageChef.Decoders.SCSI
decoded.VendorSpecific2 = new byte[SCSIInquiryResponse.Length - 96]; decoded.VendorSpecific2 = new byte[SCSIInquiryResponse.Length - 96];
Array.Copy(SCSIInquiryResponse, 96, decoded.VendorSpecific2, 0, SCSIInquiryResponse.Length - 96); Array.Copy(SCSIInquiryResponse, 96, decoded.VendorSpecific2, 0, SCSIInquiryResponse.Length - 96);
} }
if(SCSIInquiryResponse.Length >= 144)
{
// Seagate 2
decoded.Seagate2Present = true;
decoded.Seagate_Copyright = new byte[48];
Array.Copy(SCSIInquiryResponse, 96, decoded.Seagate_Copyright, 0, 48);
}
if(SCSIInquiryResponse.Length >= 148)
{
// Seagate 2
decoded.Seagate3Present = true;
decoded.Seagate_ServoPROMPartNo = new byte[4];
Array.Copy(SCSIInquiryResponse, 144, decoded.Seagate_ServoPROMPartNo, 0, 4);
}
return decoded; return decoded;
} }
@@ -1985,6 +2006,23 @@ namespace DiscImageChef.Decoders.SCSI
} }
#endregion HP vendor prettifying #endregion HP vendor prettifying
#region Seagate vendor prettifying
if((response.SeagatePresent || response.Seagate2Present || response.Seagate3Present)
&& StringHandlers.CToString(response.VendorIdentification).ToLowerInvariant().Trim() == "seagate")
{
sb.AppendLine("Seagate vendor-specific information:");
if(response.SeagatePresent)
sb.AppendFormat("Drive serial number: {0}", StringHandlers.CToString(response.Seagate_DriveSerialNumber)).AppendLine();
if(response.Seagate2Present)
sb.AppendFormat("Drive copyright: {0}", StringHandlers.CToString(response.Seagate_Copyright)).AppendLine();
if(response.Seagate3Present)
sb.AppendFormat("Drive servo part number: {0}", PrintHex.ByteArrayToHexArrayString(response.Seagate_ServoPROMPartNo, 40)).AppendLine();
}
#endregion Seagate vendor prettifying
#if DEBUG #if DEBUG
if(response.DeviceTypeModifier != 0) if(response.DeviceTypeModifier != 0)
sb.AppendFormat("Vendor's device type modifier = 0x{0:X2}", response.DeviceTypeModifier).AppendLine(); sb.AppendFormat("Vendor's device type modifier = 0x{0:X2}", response.DeviceTypeModifier).AppendLine();
@@ -2410,6 +2448,36 @@ namespace DiscImageChef.Decoders.SCSI
/// </summary> /// </summary>
public byte[] HP_OBDR; public byte[] HP_OBDR;
#endregion HP vendor unique inquiry data structure #endregion HP vendor unique inquiry data structure
#region Seagate vendor unique inquiry data structure
/// <summary>
/// Means that bytes 36 to 43 are filled
/// </summary>
public bool SeagatePresent;
/// <summary>
/// Drive Serial Number
/// Bytes 36 to 43
/// </summary>
public byte[] Seagate_DriveSerialNumber;
/// <summary>
/// Means that bytes 96 to 143 are filled
/// </summary>
public bool Seagate2Present;
/// <summary>
/// Contains Seagate copyright notice
/// Bytes 96 to 143
/// </summary>
public byte[] Seagate_Copyright;
/// <summary>
/// Means that bytes 144 to 147 are filled
/// </summary>
public bool Seagate3Present;
/// <summary>
/// Reserved Seagate field
/// Bytes 144 to 147
/// </summary>
public byte[] Seagate_ServoPROMPartNo;
#endregion Seagate vendor unique inquiry data structure
} }
#endregion Public structures #endregion Public structures

5
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,8 @@
2016-10-14 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs:
Added Seagate EVPD and INQUIRY fields.
2016-10-14 Natalia Portillo <claunia@claunia.com> 2016-10-14 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs: * Commands/DeviceInfo.cs:

9
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -355,6 +355,15 @@ namespace DiscImageChef.Commands
doWriteFile(options.OutputPrefix, string.Format("_scsi_evpd_{0:X2}h.bin", page), string.Format("SCSI INQUIRY EVPD {0:X2}h", page), inqBuf); doWriteFile(options.OutputPrefix, string.Format("_scsi_evpd_{0:X2}h.bin", page), string.Format("SCSI INQUIRY EVPD {0:X2}h", page), inqBuf);
} }
} }
else if(page == 0xC0 && StringHandlers.CToString(inq.Value.VendorIdentification).ToLowerInvariant().Trim() == "seagate")
{
sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);
if(!sense)
{
DicConsole.WriteLine("{0}", Decoders.SCSI.EVPD.PrettifyPage_C0_Seagate(inqBuf));
doWriteFile(options.OutputPrefix, string.Format("_scsi_evpd_{0:X2}h.bin", page), string.Format("SCSI INQUIRY EVPD {0:X2}h", page), inqBuf);
}
}
else if(page == 0xC0 && StringHandlers.CToString(inq.Value.VendorIdentification).ToLowerInvariant().Trim() == "ibm") else if(page == 0xC0 && StringHandlers.CToString(inq.Value.VendorIdentification).ToLowerInvariant().Trim() == "ibm")
{ {
sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page); sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);