From 27acec2aa80dd674394c538145725b963a4e4ef8 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 19 Oct 2015 03:17:03 +0100 Subject: [PATCH] * DiscImageChef.Decoders/ATA/ATA.cs: * DiscImageChef.Decoders/ATA/Identify.cs: * DiscImageChef.Decoders/DiscImageChef.Decoders.csproj: Rename fields, methods and structs to more adequate names. * DiscImageChef/Commands/Decode.cs: * DiscImageChef/Commands/DeviceInfo.cs: Rename ATA/ATAPI decoders fields, methods and structs to more adequate names. --- DiscImageChef.Decoders/ATA/{ATA.cs => Identify.cs} | 14 +++++++------- DiscImageChef.Decoders/ChangeLog | 7 +++++++ .../DiscImageChef.Decoders.csproj | 2 +- DiscImageChef/ChangeLog | 7 +++++++ DiscImageChef/Commands/Decode.cs | 4 ++-- DiscImageChef/Commands/DeviceInfo.cs | 4 ++-- 6 files changed, 26 insertions(+), 12 deletions(-) rename DiscImageChef.Decoders/ATA/{ATA.cs => Identify.cs} (99%) diff --git a/DiscImageChef.Decoders/ATA/ATA.cs b/DiscImageChef.Decoders/ATA/Identify.cs similarity index 99% rename from DiscImageChef.Decoders/ATA/ATA.cs rename to DiscImageChef.Decoders/ATA/Identify.cs index 962c8fc5..88db5b99 100644 --- a/DiscImageChef.Decoders/ATA/ATA.cs +++ b/DiscImageChef.Decoders/ATA/Identify.cs @@ -40,7 +40,7 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Console; -namespace DiscImageChef.Decoders +namespace DiscImageChef.Decoders.ATA { /// /// Information from following standards: @@ -56,7 +56,7 @@ namespace DiscImageChef.Decoders /// T13-2161D rev. 5 (ACS-3) /// CF+ & CF Specification rev. 1.4 (CFA) /// - public static class ATA + public static class Identify { [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi, Pack=2)] public struct IdentifyDevice @@ -1851,7 +1851,7 @@ namespace DiscImageChef.Decoders Clear = 0x0001, } - public static IdentifyDevice? DecodeIdentifyDevice(byte[] IdentifyDeviceResponse) + public static IdentifyDevice? Decode(byte[] IdentifyDeviceResponse) { if (IdentifyDeviceResponse == null) return null; @@ -1880,16 +1880,16 @@ namespace DiscImageChef.Decoders return ATAID; } - public static string PrettifyIdentifyDevice(byte[] IdentifyDeviceResponse) + public static string Prettify(byte[] IdentifyDeviceResponse) { if (IdentifyDeviceResponse.Length != 512) return null; - IdentifyDevice? decoded = DecodeIdentifyDevice(IdentifyDeviceResponse); - return PrettifyIdentifyDevice(decoded); + IdentifyDevice? decoded = Decode(IdentifyDeviceResponse); + return Prettify(decoded); } - public static string PrettifyIdentifyDevice(IdentifyDevice? IdentifyDeviceResponse) + public static string Prettify(IdentifyDevice? IdentifyDeviceResponse) { if (IdentifyDeviceResponse == null) return null; diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index d0083c4a..27f97e09 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,10 @@ +2015-10-19 Natalia Portillo + + * ATA/ATA.cs: + * ATA/Identify.cs: + * DiscImageChef.Decoders.csproj: + Rename fields, methods and structs to more adequate names. + 2015-10-19 Natalia Portillo * ATA/ATA.cs: diff --git a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj index f1fa6e26..35bc7403 100644 --- a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj +++ b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj @@ -35,7 +35,6 @@ - @@ -78,6 +77,7 @@ + diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index bdd8f461..3e43b197 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,10 @@ +2015-10-19 Natalia Portillo + + * Commands/Decode.cs: + * Commands/DeviceInfo.cs: + Rename ATA/ATAPI decoders fields, methods and structs to + more adequate names. + 2015-10-19 Natalia Portillo * Commands/Decode.cs: diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index c874c757..699b5987 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -96,7 +96,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("ATA IDENTIFY DEVICE command response:"); DicConsole.WriteLine("================================================================================"); - DicConsole.WriteLine(Decoders.ATA.PrettifyIdentifyDevice(identify)); + DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(identify)); DicConsole.WriteLine("================================================================================"); } break; @@ -110,7 +110,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("ATA IDENTIFY PACKET DEVICE command response:"); DicConsole.WriteLine("================================================================================"); - DicConsole.WriteLine(Decoders.ATA.PrettifyIdentifyDevice(identify)); + DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(identify)); DicConsole.WriteLine("================================================================================"); } break; diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index b1c01da9..361c4e97 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -116,7 +116,7 @@ namespace DiscImageChef.Commands else { DicConsole.WriteLine("ATAPI OK"); - DicConsole.WriteLine(Decoders.ATA.PrettifyIdentifyDevice(ataBuf)); + DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(ataBuf)); } } else @@ -137,7 +137,7 @@ namespace DiscImageChef.Commands else { DicConsole.WriteLine("ATA OK"); - DicConsole.WriteLine(Decoders.ATA.PrettifyIdentifyDevice(ataBuf)); + DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(ataBuf)); } } }