mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Rename Aaru.Console to Aaru.Logging
This commit is contained in:
@@ -187,7 +187,7 @@ public static class CdChecksums
|
||||
channel[0x00B] != 0x00)
|
||||
return null;
|
||||
|
||||
//AaruConsole.DebugWriteLine(MODULE_NAME, "Data sector, address {0:X2}:{1:X2}:{2:X2}", channel[0x00C],
|
||||
//AaruLogging.DebugWriteLine(MODULE_NAME, "Data sector, address {0:X2}:{1:X2}:{2:X2}", channel[0x00C],
|
||||
// channel[0x00D], channel[0x00E]);
|
||||
|
||||
switch(channel[0x00F] & 0x03)
|
||||
@@ -195,13 +195,13 @@ public static class CdChecksums
|
||||
// mode (1 byte)
|
||||
case 0x00:
|
||||
{
|
||||
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
// channel[0x00C], channel[0x00D], channel[0x00E]);
|
||||
for(int i = 0x010; i < 0x930; i++)
|
||||
{
|
||||
if(channel[i] == 0x00) continue;
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -214,7 +214,7 @@ public static class CdChecksums
|
||||
}
|
||||
|
||||
// mode (1 byte)
|
||||
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
// channel[0x00C], channel[0x00D], channel[0x00E]);
|
||||
case 0x01 when channel[0x814] != 0x00 || // reserved (8 bytes)
|
||||
channel[0x815] != 0x00 ||
|
||||
@@ -224,7 +224,7 @@ public static class CdChecksums
|
||||
channel[0x819] != 0x00 ||
|
||||
channel[0x81A] != 0x00 ||
|
||||
channel[0x81B] != 0x00:
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -253,7 +253,7 @@ public static class CdChecksums
|
||||
|
||||
if(failedEccP)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -262,7 +262,7 @@ public static class CdChecksums
|
||||
|
||||
if(failedEccQ)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -276,7 +276,7 @@ public static class CdChecksums
|
||||
|
||||
if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -290,7 +290,7 @@ public static class CdChecksums
|
||||
// mode (1 byte)
|
||||
case 0x02:
|
||||
{
|
||||
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
|
||||
// channel[0x00C], channel[0x00D], channel[0x00E]);
|
||||
byte[] mode2Sector = new byte[channel.Length - 0x10];
|
||||
Array.Copy(channel, 0x10, mode2Sector, 0, mode2Sector.Length);
|
||||
@@ -302,7 +302,7 @@ public static class CdChecksums
|
||||
channel[0x012] != channel[0x016] ||
|
||||
channel[0x013] != channel[0x017])
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -320,7 +320,7 @@ public static class CdChecksums
|
||||
|
||||
if(calculatedEdc == storedEdc) return true;
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -337,7 +337,7 @@ public static class CdChecksums
|
||||
channel[0x012] != channel[0x016] ||
|
||||
channel[0x013] != channel[0x017])
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -359,7 +359,7 @@ public static class CdChecksums
|
||||
|
||||
if(failedEccP)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -368,7 +368,7 @@ public static class CdChecksums
|
||||
|
||||
if(failedEccQ)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -382,7 +382,7 @@ public static class CdChecksums
|
||||
|
||||
if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Mode 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
|
||||
channel[0x00C],
|
||||
channel[0x00D],
|
||||
@@ -394,7 +394,7 @@ public static class CdChecksums
|
||||
}
|
||||
}
|
||||
default:
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
"Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
|
||||
channel[0x00F],
|
||||
channel[0x00C],
|
||||
@@ -534,35 +534,35 @@ public static class CdChecksums
|
||||
switch(cdSubRwPack1[0])
|
||||
{
|
||||
case 0x00:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x08:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x09:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x0A:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x14:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x18:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
case 0x38:
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
|
||||
|
||||
break;
|
||||
default:
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Detected_unknown_Pack_type_in_subchannel_mode_0_item_1,
|
||||
Convert.ToString(cdSubRwPack1[0] & 0x38, 2),
|
||||
Convert.ToString(cdSubRwPack1[0] & 0x07, 2));
|
||||
@@ -577,7 +577,7 @@ public static class CdChecksums
|
||||
|
||||
if(qSubChannelCrc != calculatedQcrc)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Q_subchannel_CRC_0_expected_1,
|
||||
calculatedQcrc,
|
||||
qSubChannelCrc);
|
||||
@@ -594,7 +594,7 @@ public static class CdChecksums
|
||||
|
||||
if(cdTextPack1Crc != calculatedCdtp1Crc && cdTextPack1Crc != 0)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.CD_Text_Pack_one_CRC_0_expected_1,
|
||||
cdTextPack1Crc,
|
||||
calculatedCdtp1Crc);
|
||||
@@ -610,14 +610,14 @@ public static class CdChecksums
|
||||
Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
|
||||
ushort calculatedCdtp2Crc = CRC16CcittContext.Calculate(cdTextPack2ForCrc);
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Cyclic_CDTP2_0_Calc_CDTP2_1,
|
||||
cdTextPack2Crc,
|
||||
calculatedCdtp2Crc);
|
||||
|
||||
if(cdTextPack2Crc != calculatedCdtp2Crc && cdTextPack2Crc != 0)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.CD_Text_Pack_two_CRC_0_expected_1,
|
||||
cdTextPack2Crc,
|
||||
calculatedCdtp2Crc);
|
||||
@@ -633,14 +633,14 @@ public static class CdChecksums
|
||||
Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
|
||||
ushort calculatedCdtp3Crc = CRC16CcittContext.Calculate(cdTextPack3ForCrc);
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Cyclic_CDTP3_0_Calc_CDTP3_1,
|
||||
cdTextPack3Crc,
|
||||
calculatedCdtp3Crc);
|
||||
|
||||
if(cdTextPack3Crc != calculatedCdtp3Crc && cdTextPack3Crc != 0)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.CD_Text_Pack_three_CRC_0_expected_1,
|
||||
cdTextPack3Crc,
|
||||
calculatedCdtp3Crc);
|
||||
@@ -656,14 +656,14 @@ public static class CdChecksums
|
||||
Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
|
||||
ushort calculatedCdtp4Crc = CRC16CcittContext.Calculate(cdTextPack4ForCrc);
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Cyclic_CDTP4_0_Calc_CDTP4_1,
|
||||
cdTextPack4Crc,
|
||||
calculatedCdtp4Crc);
|
||||
|
||||
if(cdTextPack4Crc == calculatedCdtp4Crc || cdTextPack4Crc == 0) return status;
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.CD_Text_Pack_four_CRC_0_expected_1,
|
||||
cdTextPack4Crc,
|
||||
calculatedCdtp4Crc);
|
||||
|
||||
@@ -452,17 +452,17 @@ public class ReedSolomon
|
||||
|
||||
if(count != noEras)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.lambda_is_wrong);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.lambda_is_wrong);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME,
|
||||
AaruLogging.Debug(MODULE_NAME,
|
||||
Localization.Erasure_positions_as_determined_by_roots_of_Eras_Loc_Poly);
|
||||
|
||||
for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
|
||||
for(i = 0; i < count; i++) AaruLogging.Debug(MODULE_NAME, "{0} ", loc[i]);
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME, "\n");
|
||||
AaruLogging.Debug(MODULE_NAME, "\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -569,11 +569,11 @@ public class ReedSolomon
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.Final_error_positions);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.Final_error_positions);
|
||||
|
||||
for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
|
||||
for(i = 0; i < count; i++) AaruLogging.Debug(MODULE_NAME, "{0} ", loc[i]);
|
||||
|
||||
AaruConsole.Debug(MODULE_NAME, "\n");
|
||||
AaruLogging.Debug(MODULE_NAME, "\n");
|
||||
#endif
|
||||
|
||||
if(degLambda != count) return -1;
|
||||
@@ -625,7 +625,7 @@ public class ReedSolomon
|
||||
|
||||
if(den == 0)
|
||||
{
|
||||
AaruConsole.Debug(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
|
||||
AaruLogging.Debug(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user