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 support for Xbox DMI, with detection and decoding.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-23 01:30:57 +01:00
parent f309ac90e2
commit ac5eadba7a
4 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
DiscImageChef.Decoders/Xbox/DMI.cs
View File

@@ -44,8 +44,31 @@ namespace DiscImageChef.Decoders.Xbox
if(dmi.Length != 2052)
return false;
// TODO: Need to implement it
// Version is 1
if(BitConverter.ToUInt32(dmi, 4) != 1)
return false;
// Catalogue number is two letters, five numbers, one letter
for(int i = 12; i < 14; i++)
{
if(dmi[i] < 0x41 || dmi[i] > 0x5A)
return false;
}
for(int i = 14; i < 19; i++)
{
if(dmi[i] < 0x30 || dmi[i] > 0x39)
return false;
}
if(dmi[19] < 0x41 || dmi[19] > 0x5A)
return false;
long timestamp = BitConverter.ToInt64(dmi, 20);
// Game cannot exist before the Xbox
if(timestamp < 0x1BD164833DFC000)
return false;
return true;
}
public static bool IsXbox360(byte[] dmi)
@@ -61,6 +84,43 @@ namespace DiscImageChef.Decoders.Xbox
return signature == 0x584F4258;
}
public struct XboxDMI
{
/// <summary>
/// Bytes 0 to 1
/// Data length
/// </summary>
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
/// </summary>
public byte Reserved1;
/// <summary>
/// Byte 3
/// Reserved
/// </summary>
public byte Reserved2;
/// <summary>
/// Bytes 4 to 7
/// 0x01 in XGD
/// </summary>
public uint Version;
/// <summary>
/// Bytes 12 to 16
/// Catalogue number in XX-XXXXX-X
/// </summary>
public string CatalogNumber;
/// <summary>
/// Bytes 20 to 27
/// DMI timestamp
/// </summary>
public long Timestamp;
}
public struct Xbox360DMI
{
/// <summary>
@@ -104,6 +164,27 @@ namespace DiscImageChef.Decoders.Xbox
public string CatalogNumber;
}
public static XboxDMI? DecodeXbox(byte[] response)
{
bool isXbox = IsXbox(response);
if(!isXbox)
return null;
XboxDMI dmi = new XboxDMI();
dmi.DataLength = (ushort)((response[0] << 8) + response[1]);
dmi.Reserved1 = response[2];
dmi.Reserved2 = response[3];
dmi.Version = BitConverter.ToUInt32(response, 4);
dmi.Timestamp = BitConverter.ToInt64(response, 20);
byte[] tmp = new byte[8];
Array.Copy(response, 12, tmp, 0, 8);
dmi.CatalogNumber = StringHandlers.CToString(tmp);
return dmi;
}
public static Xbox360DMI? DecodeXbox360(byte[] response)
{
bool isX360 = IsXbox360(response);
@@ -130,6 +211,29 @@ namespace DiscImageChef.Decoders.Xbox
return dmi;
}
public static string PrettifyXbox(XboxDMI? dmi)
{
if(dmi == null)
return null;
XboxDMI decoded = dmi.Value;
StringBuilder sb = new StringBuilder();
sb.Append("Catalogue number: ");
for(int i = 0; i < 2; i++)
sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
sb.Append("-");
for(int i = 2; i < 7; i++)
sb.AppendFormat("{0}", decoded.CatalogNumber[i]);
sb.Append("-");
sb.AppendFormat("{0}", decoded.CatalogNumber[7]);
sb.AppendLine();
sb.AppendFormat("Timestamp: {0}", DateTime.FromFileTimeUtc(decoded.Timestamp)).AppendLine();
return sb.ToString();
}
public static string PrettifyXbox360(Xbox360DMI? dmi)
{
if(dmi == null)
@@ -188,6 +292,11 @@ namespace DiscImageChef.Decoders.Xbox
return sb.ToString();
}
public static string PrettifyXbox(byte[] response)
{
return PrettifyXbox(DecodeXbox(response));
}
public static string PrettifyXbox360(byte[] response)
{
return PrettifyXbox360(DecodeXbox360(response));

4
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -506,7 +506,9 @@ namespace DiscImageChef.ImagePlugins
break;
}
if(Decoders.Xbox.DMI.IsXbox360(dmi))
if(Decoders.Xbox.DMI.IsXbox(dmi))
ImageInfo.mediaType = MediaType.XGD;
else if(Decoders.Xbox.DMI.IsXbox360(dmi))
ImageInfo.mediaType = MediaType.XGD2;
ImageInfo.readableMediaTags.Add(MediaTagType.DVD_PFI);

4
DiscImageChef.DiscImages/BlindWrite5.cs
View File

@@ -986,7 +986,9 @@ namespace DiscImageChef.ImagePlugins
break;
}
if(Decoders.Xbox.DMI.IsXbox360(dmi))
if(Decoders.Xbox.DMI.IsXbox(dmi))
ImageInfo.mediaType = MediaType.XGD;
else if(Decoders.Xbox.DMI.IsXbox360(dmi))
ImageInfo.mediaType = MediaType.XGD2;
}
}

10
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -539,10 +539,12 @@ namespace DiscImageChef.Commands
else
{
doWriteFile(outputPrefix, "_readdiscstructure_dvd_dmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
//if(Decoders.Xbox.DMI.IsXbox(cmdBuf))
// Nop();
//else if
if(Decoders.Xbox.DMI.IsXbox360(cmdBuf))
if(Decoders.Xbox.DMI.IsXbox(cmdBuf))
{
dskType = MediaType.XGD;
DicConsole.WriteLine("Xbox DMI:\n{0}", Decoders.Xbox.DMI.PrettifyXbox(cmdBuf));
}
else if(Decoders.Xbox.DMI.IsXbox360(cmdBuf))
{
// TODO: Detect XGD3 from XGD2...
dskType = MediaType.XGD2;