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

Rename Aaru.Console project to Aaru.Logging.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 05:50:25 +01:00
parent 1a6f7a02c6
commit 02ec8a05d8
365 changed files with 5465 additions and 5347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -42,9 +42,9 @@ using Aaru.Checksums;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Core.Logging;
using Aaru.Devices;
using Aaru.Logging;
using Humanizer;
using Humanizer.Bytes;
@@ -66,8 +66,8 @@ partial class Dump
byte[] cmdBuf; // Data buffer
double cmdDuration; // Command execution time
ulong sectorSpeedStart = 0; // Used to calculate correct speed
var gotFirstTrackPregap = false;
var firstTrackPregapSectorsGood = 0;
bool gotFirstTrackPregap = false;
int firstTrackPregapSectorsGood = 0;
var firstTrackPregapMs = new MemoryStream();
_dumpLog.WriteLine(Localization.Core.Reading_first_track_pregap);
@@ -164,7 +164,7 @@ partial class Dump
bool supportsPqSubchannel, bool supportsRwSubchannel,
Database.Models.Device dbDev, out bool inexactPositioning, bool dumping)
{
var sense = true; // Sense indicator
bool sense = true; // Sense indicator
byte[] subBuf = null;
int posQ;
uint retries;
@@ -211,10 +211,10 @@ partial class Dump
// Initialize the dictionary
foreach(Track t in tracks) pregaps[t.Sequence] = 0;
for(var t = 0; t < tracks.Length; t++)
for(int t = 0; t < tracks.Length; t++)
{
Track track = tracks[t];
var trackRetries = 0;
int trackRetries = 0;
// First track of each session has at least 150 sectors of pregap and is not always readable
if(tracks.Where(trk => trk.Session == track.Session).MinBy(trk => trk.Sequence).Sequence == track.Sequence)
@@ -245,14 +245,14 @@ partial class Dump
AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence);
int lba = (int)track.StartSector - 1;
var pregapFound = false;
bool pregapFound = false;
Track previousTrack = tracks.FirstOrDefault(trk => trk.Sequence == track.Sequence - 1);
var goneBack = false;
var goFront = false;
var forward = false;
var crcOk = false;
var previousPregapIsPreviousTrack = false;
bool goneBack = false;
bool goFront = false;
bool forward = false;
bool crcOk = false;
bool previousPregapIsPreviousTrack = false;
// Check if pregap is 0
for(retries = 0; retries < 10 && !pregapFound; retries++)
@@ -315,7 +315,7 @@ partial class Dump
subBuf[6] = 0;
// Fix BCD numbering
for(var i = 1; i < 10; i++)
for(int i = 1; i < 10; i++)
{
if((subBuf[i] & 0xF0) > 0xA0) subBuf[i] &= 0x7F;
@@ -442,7 +442,7 @@ partial class Dump
subBuf[6] = 0;
// Fix BCD numbering
for(var i = 1; i < 10; i++)
for(int i = 1; i < 10; i++)
{
if((subBuf[i] & 0xF0) > 0xA0) subBuf[i] &= 0x7F;
@@ -668,7 +668,7 @@ partial class Dump
if(dumping)
{
// Minus five, to ensure dumping will fix if there is a pregap LBA 0
var red = 5;
int red = 5;
while(trk.Pregap > 0 && red > 0)
{
@@ -784,7 +784,7 @@ partial class Dump
if(!sense)
{
var tmpBuf = new byte[96];
byte[] tmpBuf = new byte[96];
Array.Copy(cmdBuf, 2352, tmpBuf, 0, 96);
subBuf = DeinterleaveQ(tmpBuf);
}
@@ -988,10 +988,10 @@ partial class Dump
/// <returns>De-interleaved Q subchannel</returns>
static byte[] DeinterleaveQ(byte[] subchannel)
{
var q = new int[subchannel.Length / 8];
int[] q = new int[subchannel.Length / 8];
// De-interlace Q subchannel
for(var iq = 0; iq < subchannel.Length; iq += 8)
for(int iq = 0; iq < subchannel.Length; iq += 8)
{
q[iq / 8] = (subchannel[iq] & 0x40) << 1;
q[iq / 8] += subchannel[iq + 1] & 0x40;
@@ -1003,9 +1003,9 @@ partial class Dump
q[iq / 8] += (subchannel[iq + 7] & 0x40) >> 6;
}
var deQ = new byte[q.Length];
byte[] deQ = new byte[q.Length];
for(var iq = 0; iq < q.Length; iq++) deQ[iq] = (byte)q[iq];
for(int iq = 0; iq < q.Length; iq++) deQ[iq] = (byte)q[iq];
return deQ;
}