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

REFACTOR: Member or type can be made internal.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 02:08:37 +00:00
parent b53b80c998
commit ef49fdfd45
87 changed files with 544 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Core/Checksum.cs
View File

@@ -381,7 +381,7 @@ namespace DiscImageChef.Core
return chks;
}
public static List<ChecksumType> GetChecksums(byte[] data, EnableChecksum enabled = EnableChecksum.All)
internal static List<ChecksumType> GetChecksums(byte[] data, EnableChecksum enabled = EnableChecksum.All)
{
Adler32Context adler32ctxData = null;
CRC16Context crc16ctxData = null;

6
DiscImageChef.Core/DataFile.cs
View File

@@ -14,16 +14,16 @@
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// 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.
// GNU General public License for more details.
//
// You should have received a copy of the GNU General Public License
// You should have received a copy of the GNU General public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------

24
DiscImageChef.Core/Devices/Dumping/Alcohol120.cs
View File

@@ -41,7 +41,7 @@ using DiscImageChef.ImagePlugins;
namespace DiscImageChef.Core.Devices.Dumping
{
// TODO: For >4.0, this class must disappear
public class Alcohol120
class Alcohol120
{
#region Internal Structures
[StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -158,7 +158,7 @@ namespace DiscImageChef.Core.Devices.Dumping
Dictionary<byte, uint> trackLengths;
AlcoholFooter footer;
public Alcohol120(string outputPrefix)
internal Alcohol120(string outputPrefix)
{
this.outputPrefix = outputPrefix;
header = new AlcoholHeader
@@ -178,7 +178,7 @@ namespace DiscImageChef.Core.Devices.Dumping
footer = new AlcoholFooter {widechar = 1};
}
public void Close()
internal void Close()
{
if(sessions.Count == 0 || tracks.Count == 0) return;
@@ -317,7 +317,7 @@ namespace DiscImageChef.Core.Devices.Dumping
descriptorFile.Dispose();
}
public void SetMediaType(MediaType type)
internal void SetMediaType(MediaType type)
{
switch(type)
{
@@ -376,7 +376,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}
}
public void AddSessions(Session[] cdSessions)
internal void AddSessions(Session[] cdSessions)
{
foreach(Session cdSession in cdSessions)
{
@@ -390,7 +390,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}
}
public void SetTrackTypes(byte point, TrackType mode, TrackSubchannelType subMode)
internal void SetTrackTypes(byte point, TrackType mode, TrackSubchannelType subMode)
{
AlcoholTrack[] trkArray = tracks.ToArray();
@@ -443,7 +443,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}
}
public void SetTrackSizes(byte point, int sectorSize, long startLba, long startOffset, long length)
internal void SetTrackSizes(byte point, int sectorSize, long startLba, long startOffset, long length)
{
AlcoholTrack[] trkArray = tracks.ToArray();
@@ -474,7 +474,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sessions = new List<AlcoholSession>(sess);
}
public void AddTrack(byte adrCtl, byte tno, byte point, byte min, byte sec, byte frame, byte zero, byte pmin,
internal void AddTrack(byte adrCtl, byte tno, byte point, byte min, byte sec, byte frame, byte zero, byte pmin,
byte psec, byte pframe, byte session)
{
AlcoholTrack trk = new AlcoholTrack
@@ -507,12 +507,12 @@ namespace DiscImageChef.Core.Devices.Dumping
sessions = new List<AlcoholSession>(sess);
}
public void AddBCA(byte[] bca)
internal void AddBCA(byte[] bca)
{
this.bca = bca;
}
public void AddPFI(byte[] pfi)
internal void AddPFI(byte[] pfi)
{
if(pfi.Length == 2052)
{
@@ -522,7 +522,7 @@ namespace DiscImageChef.Core.Devices.Dumping
else this.pfi = pfi;
}
public void AddDMI(byte[] dmi)
internal void AddDMI(byte[] dmi)
{
if(dmi.Length == 2052)
{
@@ -532,7 +532,7 @@ namespace DiscImageChef.Core.Devices.Dumping
else this.dmi = dmi;
}
public void SetExtension(string extension)
internal void SetExtension(string extension)
{
this.extension = extension;
}

4
DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs
View File

@@ -38,9 +38,9 @@ using Schemas;
namespace DiscImageChef.Core.Devices.Dumping
{
public static class ResumeSupport
static class ResumeSupport
{
public static void Process(bool isLba, bool removable, ulong blocks, string Manufacturer, string Model,
internal static void Process(bool isLba, bool removable, ulong blocks, string Manufacturer, string Model,
string Serial, Interop.PlatformID platform, ref Resume resume,
ref DumpHardwareType currentTry, ref ExtentsULong extents)
{

42
DiscImageChef.Core/Devices/Reader.cs
View File

@@ -36,7 +36,7 @@ using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices
{
public partial class Reader
partial class Reader
{
Device dev;
uint timeout;
@@ -48,44 +48,44 @@ namespace DiscImageChef.Core.Devices
uint physicalsectorsize;
uint longBlockSize;
public string ErrorMessage
internal string ErrorMessage
{
get { return errorMessage; }
}
public ulong Blocks
internal ulong Blocks
{
get { return blocks; }
}
public uint BlocksToRead
internal uint BlocksToRead
{
get { return blocksToRead; }
}
public uint LogicalBlockSize
internal uint LogicalBlockSize
{
get { return blockSize; }
}
public uint PhysicalBlockSize
internal uint PhysicalBlockSize
{
get { return physicalsectorsize; }
}
public uint LongBlockSize
internal uint LongBlockSize
{
get { return longBlockSize; }
}
public bool CanReadRaw
internal bool CanReadRaw
{
get { return readRaw; }
}
public bool CanSeek
internal bool CanSeek
{
get { return ataSeek || seek6 || seek10; }
}
public bool CanSeekLBA
internal bool CanSeekLBA
{
get { return ataSeekLba || seek6 || seek10; }
}
public Reader(Device dev, uint timeout, byte[] identification, bool raw = false)
internal Reader(Device dev, uint timeout, byte[] identification, bool raw = false)
{
this.dev = dev;
this.timeout = timeout;
@@ -101,7 +101,7 @@ namespace DiscImageChef.Core.Devices
}
}
public ulong GetDeviceBlocks()
internal ulong GetDeviceBlocks()
{
switch(dev.Type)
{
@@ -114,7 +114,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool FindReadCommand()
internal bool FindReadCommand()
{
switch(dev.Type)
{
@@ -127,7 +127,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool GetBlockSize()
internal bool GetBlockSize()
{
switch(dev.Type)
{
@@ -140,7 +140,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool GetBlocksToRead(uint startWithBlocks = 64)
internal bool GetBlocksToRead(uint startWithBlocks = 64)
{
switch(dev.Type)
{
@@ -153,17 +153,17 @@ namespace DiscImageChef.Core.Devices
}
}
public bool ReadBlock(out byte[] buffer, ulong block, out double duration)
internal bool ReadBlock(out byte[] buffer, ulong block, out double duration)
{
return ReadBlocks(out buffer, block, 1, out duration);
}
public bool ReadBlocks(out byte[] buffer, ulong block, out double duration)
internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration)
{
return ReadBlocks(out buffer, block, blocksToRead, out duration);
}
public bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)
internal bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)
{
switch(dev.Type)
{
@@ -177,7 +177,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool ReadCHS(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration)
internal bool ReadCHS(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration)
{
switch(dev.Type)
{
@@ -189,7 +189,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool Seek(ulong block, out double duration)
internal bool Seek(ulong block, out double duration)
{
switch(dev.Type)
{
@@ -202,7 +202,7 @@ namespace DiscImageChef.Core.Devices
}
}
public bool SeekCHS(ushort cylinder, byte head, byte sector, out double duration)
internal bool SeekCHS(ushort cylinder, byte head, byte sector, out double duration)
{
switch(dev.Type)
{

12
DiscImageChef.Core/Devices/ReaderATA.cs
View File

@@ -37,7 +37,7 @@ using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices
{
public partial class Reader
partial class Reader
{
bool ataReadLba;
bool ataReadRetryLba;
@@ -57,24 +57,24 @@ namespace DiscImageChef.Core.Devices
Identify.IdentifyDevice ataId;
public bool IsLBA
internal bool IsLBA
{
get { return lbaMode; }
}
public ushort Cylinders
internal ushort Cylinders
{
get { return cylinders; }
}
public byte Heads
internal byte Heads
{
get { return heads; }
}
public byte Sectors
internal byte Sectors
{
get { return sectors; }
}
public (uint, byte, byte) GetDeviceCHS()
(uint, byte, byte) GetDeviceCHS()
{
if(dev.Type != DeviceType.ATA) return (0, 0, 0);

2
DiscImageChef.Core/Devices/ReaderSCSI.cs
View File

@@ -35,7 +35,7 @@ using DiscImageChef.Console;
namespace DiscImageChef.Core.Devices
{
public partial class Reader
partial class Reader
{
// TODO: Raw reading
bool read6;

4
DiscImageChef.Core/Devices/Report/ATAPI.cs
View File

@@ -36,9 +36,9 @@ using DiscImageChef.Metadata;
namespace DiscImageChef.Core.Devices.Report
{
public static class ATAPI
static class ATAPI
{
public static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
internal static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
{
if(report == null) return;

4
DiscImageChef.Core/Devices/Report/FireWire.cs
View File

@@ -37,9 +37,9 @@ using DiscImageChef.Metadata;
namespace DiscImageChef.Core.Devices.Report
{
public static class FireWire
static class FireWire
{
public static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
internal static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
{
if(report == null) return;

4
DiscImageChef.Core/Devices/Report/PCMCIA.cs
View File

@@ -36,9 +36,9 @@ using DiscImageChef.Metadata;
namespace DiscImageChef.Core.Devices.Report
{
public static class PCMCIA
static class PCMCIA
{
public static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
internal static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
{
report.PCMCIA = new pcmciaType();
report.PCMCIA.CIS = dev.CIS;

4
DiscImageChef.Core/Devices/Report/USB.cs
View File

@@ -37,9 +37,9 @@ using DiscImageChef.Metadata;
namespace DiscImageChef.Core.Devices.Report
{
public static class USB
static class USB
{
public static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
internal static void Report(Device dev, ref DeviceReport report, bool debug, ref bool removable)
{
if(report == null) return;

8
DiscImageChef.Core/Logging/IBGLog.cs
View File

@@ -38,7 +38,7 @@ using DiscImageChef.Devices;
namespace DiscImageChef.Core.Logging
{
public class IBGLog
class IBGLog
{
static FileStream ibgFs;
static StringBuilder ibgSb;
@@ -54,7 +54,7 @@ namespace DiscImageChef.Core.Logging
static ulong ibgIntSector;
static int ibgSampleRate;
public IBGLog(string outputFile, ushort currentProfile)
internal IBGLog(string outputFile, ushort currentProfile)
{
if(!string.IsNullOrEmpty(outputFile))
{
@@ -193,7 +193,7 @@ namespace DiscImageChef.Core.Logging
}
}
public void Write(ulong sector, double currentSpeed)
internal void Write(ulong sector, double currentSpeed)
{
if(ibgFs != null)
{
@@ -222,7 +222,7 @@ namespace DiscImageChef.Core.Logging
}
}
public void Close(Device dev, ulong blocks, ulong blockSize, double totalSeconds, double currentSpeed,
internal void Close(Device dev, ulong blocks, ulong blockSize, double totalSeconds, double currentSpeed,
double averageSpeed, string devicePath)
{
if(ibgFs != null)

10
DiscImageChef.Core/Logging/MHDDLog.cs
View File

@@ -37,11 +37,11 @@ using DiscImageChef.Devices;
namespace DiscImageChef.Core.Logging
{
public class MHDDLog
class MHDDLog
{
static FileStream mhddFs;
FileStream mhddFs;
public MHDDLog(string outputFile, Device dev, ulong blocks, ulong blockSize, ulong blocksToRead)
internal MHDDLog(string outputFile, Device dev, ulong blocks, ulong blockSize, ulong blocksToRead)
{
if(dev != null && !string.IsNullOrEmpty(outputFile))
{
@@ -128,7 +128,7 @@ namespace DiscImageChef.Core.Logging
}
}
public void Write(ulong sector, double duration)
internal void Write(ulong sector, double duration)
{
if(mhddFs != null)
{
@@ -140,7 +140,7 @@ namespace DiscImageChef.Core.Logging
}
}
public void Close()
internal void Close()
{
if(mhddFs != null) mhddFs.Close();
}

12
DiscImageChef.Core/Version.cs
View File

@@ -14,16 +14,16 @@
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// it under the terms of the GNU General internal 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.
// GNU General internal License for more details.
//
// You should have received a copy of the GNU General Public License
// You should have received a copy of the GNU General internal License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
@@ -35,9 +35,9 @@ using Schemas;
namespace DiscImageChef.Core
{
public static class Version
static class Version
{
public static SoftwareType GetSoftwareType(PlatformID platform)
internal static SoftwareType GetSoftwareType(PlatformID platform)
{
return new SoftwareType
{
@@ -47,7 +47,7 @@ namespace DiscImageChef.Core
};
}
public static string GetVersion()
internal static string GetVersion()
{
return typeof(Version).Assembly.GetName().Version.ToString();
}