General code refactor and reformat.

This commit is contained in:
2018-12-31 13:17:27 +00:00
parent 06a27f18b0
commit e2bbb9994f
72 changed files with 433 additions and 897 deletions

View File

@@ -181,14 +181,8 @@ namespace DiscImageChef.Decoders.MMC
return sb.ToString();
}
public static string PrettifyCID(uint[] response)
{
return PrettifyCID(DecodeCID(response));
}
public static string PrettifyCID(uint[] response) => PrettifyCID(DecodeCID(response));
public static string PrettifyCID(byte[] response)
{
return PrettifyCID(DecodeCID(response));
}
public static string PrettifyCID(byte[] response) => PrettifyCID(DecodeCID(response));
}
}

View File

@@ -561,14 +561,8 @@ namespace DiscImageChef.Decoders.MMC
return sb.ToString();
}
public static string PrettifyCSD(uint[] response)
{
return PrettifyCSD(DecodeCSD(response));
}
public static string PrettifyCSD(uint[] response) => PrettifyCSD(DecodeCSD(response));
public static string PrettifyCSD(byte[] response)
{
return PrettifyCSD(DecodeCSD(response));
}
public static string PrettifyCSD(byte[] response) => PrettifyCSD(DecodeCSD(response));
}
}

View File

@@ -707,9 +707,6 @@ namespace DiscImageChef.Decoders.MMC
return sb.ToString();
}
public static string PrettifyExtendedCSD(byte[] response)
{
return PrettifyExtendedCSD(DecodeExtendedCSD(response));
}
public static string PrettifyExtendedCSD(byte[] response) => PrettifyExtendedCSD(DecodeExtendedCSD(response));
}
}

View File

@@ -68,9 +68,8 @@ namespace DiscImageChef.Decoders.MMC
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
public static partial class Decoders
{
public static OCR DecodeOCR(uint response)
{
return new OCR
public static OCR DecodeOCR(uint response) =>
new OCR
{
PowerUp = (response & 0x80000000) == 0x80000000,
AccessMode = (byte)((response & 0x60000000) >> 29),
@@ -92,12 +91,9 @@ namespace DiscImageChef.Decoders.MMC
TwoZero = (response & 0x00000100) == 0x00000100,
OneSix = (response & 0x00000080) == 0x00000080
};
}
public static OCR DecodeOCR(byte[] response)
{
return response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0));
}
public static OCR DecodeOCR(byte[] response) =>
response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0));
public static string PrettifyOCR(OCR ocr)
{
@@ -139,14 +135,8 @@ namespace DiscImageChef.Decoders.MMC
return sb.ToString();
}
public static string PrettifyOCR(byte[] response)
{
return PrettifyOCR(DecodeOCR(response));
}
public static string PrettifyOCR(byte[] response) => PrettifyOCR(DecodeOCR(response));
public static string PrettifyOCR(uint response)
{
return PrettifyOCR(DecodeOCR(response));
}
public static string PrettifyOCR(uint response) => PrettifyOCR(DecodeOCR(response));
}
}