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 to Aaru.Logging

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 06:11:22 +01:00
parent f2268c0bbb
commit 50061ca7d5
352 changed files with 12048 additions and 12048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Aaru.Partitions/AppleMap.cs
View File

@@ -104,13 +104,13 @@ public sealed class AppleMap : IPartition
AppleDriverDescriptorMap ddm = Marshal.ByteArrayToStructureBigEndian<AppleDriverDescriptorMap>(ddmSector);
AaruConsole.Debug(MODULE_NAME, "ddm.sbSig = 0x{0:X4}", ddm.sbSig);
AaruConsole.Debug(MODULE_NAME, "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
AaruConsole.Debug(MODULE_NAME, "ddm.sbBlocks = {0}", ddm.sbBlocks);
AaruConsole.Debug(MODULE_NAME, "ddm.sbDevType = {0}", ddm.sbDevType);
AaruConsole.Debug(MODULE_NAME, "ddm.sbDevId = {0}", ddm.sbDevId);
AaruConsole.Debug(MODULE_NAME, "ddm.sbData = 0x{0:X8}", ddm.sbData);
AaruConsole.Debug(MODULE_NAME, "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
AaruLogging.Debug(MODULE_NAME, "ddm.sbSig = 0x{0:X4}", ddm.sbSig);
AaruLogging.Debug(MODULE_NAME, "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
AaruLogging.Debug(MODULE_NAME, "ddm.sbBlocks = {0}", ddm.sbBlocks);
AaruLogging.Debug(MODULE_NAME, "ddm.sbDevType = {0}", ddm.sbDevType);
AaruLogging.Debug(MODULE_NAME, "ddm.sbDevId = {0}", ddm.sbDevId);
AaruLogging.Debug(MODULE_NAME, "ddm.sbData = 0x{0:X8}", ddm.sbData);
AaruLogging.Debug(MODULE_NAME, "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
uint sequence = 0;
@@ -126,11 +126,11 @@ public sealed class AppleMap : IPartition
Array.Copy(ddmSector, 18 + i * 8, tmp, 0, 8);
ddm.sbMap[i] = Marshal.ByteArrayToStructureBigEndian<AppleDriverEntry>(tmp);
AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddBlock = {0}", ddm.sbMap[i].ddBlock, i);
AaruLogging.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddBlock = {0}", ddm.sbMap[i].ddBlock, i);
AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i);
AaruLogging.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i);
AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i);
AaruLogging.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i);
if(ddm.sbMap[i].ddSize == 0) continue;
@@ -171,17 +171,17 @@ public sealed class AppleMap : IPartition
AppleMapOldPartitionEntry oldEntry =
Marshal.ByteArrayToStructureBigEndian<AppleMapOldPartitionEntry>(tmp);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"old_map.sbMap[{1}].pdStart = {0}",
oldEntry.pdStart,
(i - 2) / 12);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"old_map.sbMap[{1}].pdSize = {0}",
oldEntry.pdSize,
(i - 2) / 12);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
oldEntry.pdFSID,
(i - 2) / 12);
@@ -228,7 +228,7 @@ public sealed class AppleMap : IPartition
// Check for a partition entry that's 512-byte aligned
if(entry.signature == APM_MAGIC)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_misaligned_entry);
AaruLogging.Debug(MODULE_NAME, Localization.Found_misaligned_entry);
entrySize = 512;
entryCount = entry.entries;
skipDdm = 512;
@@ -240,7 +240,7 @@ public sealed class AppleMap : IPartition
if(entry.signature == APM_MAGIC)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_aligned_entry);
AaruLogging.Debug(MODULE_NAME, Localization.Found_aligned_entry);
entrySize = sectorSize;
entryCount = entry.entries;
skipDdm = sectorSize;
@@ -256,7 +256,7 @@ public sealed class AppleMap : IPartition
if(entry.signature == APM_MAGIC)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_aligned_entry);
AaruLogging.Debug(MODULE_NAME, Localization.Found_aligned_entry);
entrySize = sectorSize;
entryCount = entry.entries;
skipDdm = sectorSize;
@@ -270,10 +270,10 @@ public sealed class AppleMap : IPartition
if(errno != ErrorNumber.NoError) return false;
AaruConsole.Debug(MODULE_NAME, "entry_size = {0}", entrySize);
AaruConsole.Debug(MODULE_NAME, "entry_count = {0}", entryCount);
AaruConsole.Debug(MODULE_NAME, "skip_ddm = {0}", skipDdm);
AaruConsole.Debug(MODULE_NAME, "sectors_to_read = {0}", sectorsToRead);
AaruLogging.Debug(MODULE_NAME, "entry_size = {0}", entrySize);
AaruLogging.Debug(MODULE_NAME, "entry_count = {0}", entryCount);
AaruLogging.Debug(MODULE_NAME, "skip_ddm = {0}", skipDdm);
AaruLogging.Debug(MODULE_NAME, "sectors_to_read = {0}", sectorsToRead);
byte[] copy = new byte[entries.Length - skipDdm];
Array.Copy(entries, skipDdm, copy, 0, copy.Length);
@@ -287,42 +287,42 @@ public sealed class AppleMap : IPartition
if(entry.signature != APM_MAGIC) continue;
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entries = {1}", i, entry.entries);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].start = {1}", i, entry.start);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].sectors = {1}", i, entry.sectors);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].entries = {1}", i, entry.entries);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].start = {1}", i, entry.start);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].sectors = {1}", i, entry.sectors);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dpme[{0}].name = \"{1}\"",
i,
StringHandlers.CToString(entry.name));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dpme[{0}].type = \"{1}\"",
i,
StringHandlers.CToString(entry.type));
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].first_data_block = {1}", i, entry.first_data_block);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].first_data_block = {1}", i, entry.first_data_block);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].flags = {1}", i, (AppleMapFlags)entry.flags);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].flags = {1}", i, (AppleMapFlags)entry.flags);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].first_boot_block = {1}", i, entry.first_boot_block);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].first_boot_block = {1}", i, entry.first_boot_block);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].boot_size = {1}", i, entry.boot_size);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].boot_size = {1}", i, entry.boot_size);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].load_address = 0x{1:X8}", i, entry.load_address);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].load_address = 0x{1:X8}", i, entry.load_address);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].load_address2 = 0x{1:X8}", i, entry.load_address2);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].load_address2 = 0x{1:X8}", i, entry.load_address2);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entry_point2 = 0x{1:X8}", i, entry.entry_point2);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].entry_point2 = 0x{1:X8}", i, entry.entry_point2);
AaruConsole.Debug(MODULE_NAME, "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
AaruLogging.Debug(MODULE_NAME, "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dpme[{0}].processor = \"{1}\"",
i,
StringHandlers.CToString(entry.processor));
@@ -387,7 +387,7 @@ public sealed class AppleMap : IPartition
// Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
else if(partition.Start < imagePlugin.Info.Sectors)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Cutting_last_partition_end_0_to_media_size_1,
partition.End,
imagePlugin.Info.Sectors - 1);
@@ -398,7 +398,7 @@ public sealed class AppleMap : IPartition
}
else
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Not_adding_partition_because_start_0_is_outside_media_size_1,
partition.Start,
imagePlugin.Info.Sectors - 1);

202
Aaru.Partitions/Apricot.cs
View File

@@ -107,229 +107,229 @@ public sealed class Apricot : IPartition
label.firstDataBlock > deviceSectors)
return false;
AaruConsole.Debug(MODULE_NAME, "label.version = \"{0}\"", StringHandlers.CToString(label.version));
AaruLogging.Debug(MODULE_NAME, "label.version = \"{0}\"", StringHandlers.CToString(label.version));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.operatingSystem = {0} ({1})",
label.operatingSystem,
label.operatingSystem < _operatingSystemCodes.Length
? _operatingSystemCodes[label.operatingSystem]
: Localization.Unknown_operating_system);
AaruConsole.Debug(MODULE_NAME, "label.writeProtected = {0}", label.writeProtected);
AaruConsole.Debug(MODULE_NAME, "label.copyProtected = {0}", label.copyProtected);
AaruLogging.Debug(MODULE_NAME, "label.writeProtected = {0}", label.writeProtected);
AaruLogging.Debug(MODULE_NAME, "label.copyProtected = {0}", label.copyProtected);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.bootType = {0} ({1})",
label.bootType,
label.bootType < _bootTypeCodes.Length
? _bootTypeCodes[label.bootType]
: Localization.Unknown_boot_type);
AaruConsole.Debug(MODULE_NAME, "label.partitionCount = {0}", label.partitionCount);
AaruConsole.Debug(MODULE_NAME, "label.winchester = {0}", label.winchester);
AaruConsole.Debug(MODULE_NAME, "label.sectorSize = {0}", label.sectorSize);
AaruConsole.Debug(MODULE_NAME, "label.spt = {0}", label.spt);
AaruConsole.Debug(MODULE_NAME, "label.cylinders = {0}", label.cylinders);
AaruConsole.Debug(MODULE_NAME, "label.heads = {0}", label.heads);
AaruConsole.Debug(MODULE_NAME, "label.interleave = {0}", label.interleave);
AaruConsole.Debug(MODULE_NAME, "label.skew = {0}", label.skew);
AaruConsole.Debug(MODULE_NAME, "label.bootLocation = {0}", label.bootLocation);
AaruConsole.Debug(MODULE_NAME, "label.bootSize = {0}", label.bootSize);
AaruConsole.Debug(MODULE_NAME, "label.bootAddress = 0x{0:X8}", label.bootAddress);
AaruLogging.Debug(MODULE_NAME, "label.partitionCount = {0}", label.partitionCount);
AaruLogging.Debug(MODULE_NAME, "label.winchester = {0}", label.winchester);
AaruLogging.Debug(MODULE_NAME, "label.sectorSize = {0}", label.sectorSize);
AaruLogging.Debug(MODULE_NAME, "label.spt = {0}", label.spt);
AaruLogging.Debug(MODULE_NAME, "label.cylinders = {0}", label.cylinders);
AaruLogging.Debug(MODULE_NAME, "label.heads = {0}", label.heads);
AaruLogging.Debug(MODULE_NAME, "label.interleave = {0}", label.interleave);
AaruLogging.Debug(MODULE_NAME, "label.skew = {0}", label.skew);
AaruLogging.Debug(MODULE_NAME, "label.bootLocation = {0}", label.bootLocation);
AaruLogging.Debug(MODULE_NAME, "label.bootSize = {0}", label.bootSize);
AaruLogging.Debug(MODULE_NAME, "label.bootAddress = 0x{0:X8}", label.bootAddress);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.bootOffset:label.bootSegment = {0:X4}:{1:X4}",
label.bootOffset,
label.bootSegment);
AaruConsole.Debug(MODULE_NAME, "label.firstDataBlock = {0}", label.firstDataBlock);
AaruConsole.Debug(MODULE_NAME, "label.generation = {0}", label.generation);
AaruConsole.Debug(MODULE_NAME, "label.copyCount = {0}", label.copyCount);
AaruConsole.Debug(MODULE_NAME, "label.maxCopies = {0}", label.maxCopies);
AaruLogging.Debug(MODULE_NAME, "label.firstDataBlock = {0}", label.firstDataBlock);
AaruLogging.Debug(MODULE_NAME, "label.generation = {0}", label.generation);
AaruLogging.Debug(MODULE_NAME, "label.copyCount = {0}", label.copyCount);
AaruLogging.Debug(MODULE_NAME, "label.maxCopies = {0}", label.maxCopies);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.serialNumber = \"{0}\"",
StringHandlers.CToString(label.serialNumber));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partNumber = \"{0}\"",
StringHandlers.CToString(label.partNumber));
AaruConsole.Debug(MODULE_NAME, "label.copyright = \"{0}\"", StringHandlers.CToString(label.copyright));
AaruLogging.Debug(MODULE_NAME, "label.copyright = \"{0}\"", StringHandlers.CToString(label.copyright));
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.bps = {0}", label.mainBPB.bps);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.spc = {0}", label.mainBPB.spc);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.fats_no = {0}", label.mainBPB.fats_no);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.sectors = {0}", label.mainBPB.sectors);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.media = {0}", label.mainBPB.media);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.spfat = {0}", label.mainBPB.spfat);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.bps = {0}", label.mainBPB.bps);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.spc = {0}", label.mainBPB.spc);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.fats_no = {0}", label.mainBPB.fats_no);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.sectors = {0}", label.mainBPB.sectors);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.media = {0}", label.mainBPB.media);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.spfat = {0}", label.mainBPB.spfat);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.mainBPB.diskType = {0} ({1})",
label.mainBPB.diskType,
label.mainBPB.diskType < _diskTypeCodes.Length
? _diskTypeCodes[label.mainBPB.diskType]
: Localization.Unknown_disk_type);
AaruConsole.Debug(MODULE_NAME, "label.mainBPB.startSector = {0}", label.mainBPB.startSector);
AaruLogging.Debug(MODULE_NAME, "label.mainBPB.startSector = {0}", label.mainBPB.startSector);
AaruConsole.Debug(MODULE_NAME, "label.fontName = \"{0}\"", StringHandlers.CToString(label.fontName));
AaruLogging.Debug(MODULE_NAME, "label.fontName = \"{0}\"", StringHandlers.CToString(label.fontName));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.keyboardName = \"{0}\"",
StringHandlers.CToString(label.keyboardName));
AaruConsole.Debug(MODULE_NAME, "label.biosMajorVersion = {0}", label.biosMajorVersion);
AaruConsole.Debug(MODULE_NAME, "label.biosMinorVersion = {0}", label.biosMinorVersion);
AaruConsole.Debug(MODULE_NAME, "label.diagnosticsFlag = {0}", label.diagnosticsFlag);
AaruLogging.Debug(MODULE_NAME, "label.biosMajorVersion = {0}", label.biosMajorVersion);
AaruLogging.Debug(MODULE_NAME, "label.biosMinorVersion = {0}", label.biosMinorVersion);
AaruLogging.Debug(MODULE_NAME, "label.diagnosticsFlag = {0}", label.diagnosticsFlag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.prnDevice = {0} ({1})",
label.prnDevice,
label.prnDevice < _printDevices.Length
? _printDevices[label.prnDevice]
: Localization.Unknown_print_device);
AaruConsole.Debug(MODULE_NAME, "label.bellVolume = {0}", label.bellVolume);
AaruConsole.Debug(MODULE_NAME, "label.enableCache = {0}", label.enableCache);
AaruConsole.Debug(MODULE_NAME, "label.enableGraphics = {0}", label.enableGraphics);
AaruConsole.Debug(MODULE_NAME, "label.dosLength = {0}", label.dosLength);
AaruConsole.Debug(MODULE_NAME, "label.fontLength = {0}", label.fontLength);
AaruConsole.Debug(MODULE_NAME, "label.keyboardLength = {0}", label.keyboardLength);
AaruConsole.Debug(MODULE_NAME, "label.dosStart = {0}", label.dosStart);
AaruConsole.Debug(MODULE_NAME, "label.fontStart = {0}", label.fontStart);
AaruConsole.Debug(MODULE_NAME, "label.keyboardStart = {0}", label.keyboardStart);
AaruConsole.Debug(MODULE_NAME, "label.keyboardVolume = {0}", label.keyboardVolume);
AaruConsole.Debug(MODULE_NAME, "label.autorepeat = {0}", label.autorepeat);
AaruConsole.Debug(MODULE_NAME, "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
AaruLogging.Debug(MODULE_NAME, "label.bellVolume = {0}", label.bellVolume);
AaruLogging.Debug(MODULE_NAME, "label.enableCache = {0}", label.enableCache);
AaruLogging.Debug(MODULE_NAME, "label.enableGraphics = {0}", label.enableGraphics);
AaruLogging.Debug(MODULE_NAME, "label.dosLength = {0}", label.dosLength);
AaruLogging.Debug(MODULE_NAME, "label.fontLength = {0}", label.fontLength);
AaruLogging.Debug(MODULE_NAME, "label.keyboardLength = {0}", label.keyboardLength);
AaruLogging.Debug(MODULE_NAME, "label.dosStart = {0}", label.dosStart);
AaruLogging.Debug(MODULE_NAME, "label.fontStart = {0}", label.fontStart);
AaruLogging.Debug(MODULE_NAME, "label.keyboardStart = {0}", label.keyboardStart);
AaruLogging.Debug(MODULE_NAME, "label.keyboardVolume = {0}", label.keyboardVolume);
AaruLogging.Debug(MODULE_NAME, "label.autorepeat = {0}", label.autorepeat);
AaruLogging.Debug(MODULE_NAME, "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
AaruConsole.Debug(MODULE_NAME, "label.autorepeatInterval = {0}", label.autorepeatInterval);
AaruLogging.Debug(MODULE_NAME, "label.autorepeatInterval = {0}", label.autorepeatInterval);
AaruConsole.Debug(MODULE_NAME, "label.microscreenMode = {0}", label.microscreenMode);
AaruLogging.Debug(MODULE_NAME, "label.microscreenMode = {0}", label.microscreenMode);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareKeyboard is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.lineMode = {0} ({1} lines)",
label.lineMode,
label.lineMode < _lineModes.Length ? _lineModes[label.lineMode] : 0);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.lineWidth = {0} ({1} columns)",
label.lineWidth,
label.lineWidth < _lineWidths.Length ? _lineWidths[label.lineWidth] : 0);
AaruConsole.Debug(MODULE_NAME, "label.imageOff = {0}", label.imageOff);
AaruLogging.Debug(MODULE_NAME, "label.imageOff = {0}", label.imageOff);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareScreen is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.txBaudRate = {0} ({1} bps)",
label.txBaudRate,
label.txBaudRate < _baudRates.Length ? _baudRates[label.txBaudRate] : 0);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.rxBaudRate = {0} ({1} bps)",
label.rxBaudRate,
label.rxBaudRate < _baudRates.Length ? _baudRates[label.rxBaudRate] : 0);
AaruConsole.Debug(MODULE_NAME, "label.txBits = {0}", label.txBits);
AaruConsole.Debug(MODULE_NAME, "label.rxBits = {0}", label.rxBits);
AaruLogging.Debug(MODULE_NAME, "label.txBits = {0}", label.txBits);
AaruLogging.Debug(MODULE_NAME, "label.rxBits = {0}", label.rxBits);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.stopBits = {0} ({1} bits)",
label.stopBits,
label.stopBits < _stopBits.Length ? _stopBits[label.stopBits] : 0);
AaruConsole.Debug(MODULE_NAME, "label.parityCheck = {0}", label.parityCheck);
AaruLogging.Debug(MODULE_NAME, "label.parityCheck = {0}", label.parityCheck);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.parityType = {0} ({1})",
label.parityType,
label.parityType < _parityTypes.Length
? _parityTypes[label.parityType]
: Localization.Unknown_parity_type);
AaruConsole.Debug(MODULE_NAME, "label.txXonXoff = {0}", label.txXonXoff);
AaruConsole.Debug(MODULE_NAME, "label.rxXonXoff = {0}", label.rxXonXoff);
AaruConsole.Debug(MODULE_NAME, "label.xonCharacter = {0}", label.xonCharacter);
AaruConsole.Debug(MODULE_NAME, "label.xoffCharacter = {0}", label.xoffCharacter);
AaruConsole.Debug(MODULE_NAME, "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
AaruConsole.Debug(MODULE_NAME, "label.dtrDsr = {0}", label.dtrDsr);
AaruConsole.Debug(MODULE_NAME, "label.ctsRts = {0}", label.ctsRts);
AaruConsole.Debug(MODULE_NAME, "label.nullsAfterCr = {0}", label.nullsAfterCr);
AaruConsole.Debug(MODULE_NAME, "label.nullsAfterFF = {0}", label.nullsAfterFF);
AaruConsole.Debug(MODULE_NAME, "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
AaruLogging.Debug(MODULE_NAME, "label.txXonXoff = {0}", label.txXonXoff);
AaruLogging.Debug(MODULE_NAME, "label.rxXonXoff = {0}", label.rxXonXoff);
AaruLogging.Debug(MODULE_NAME, "label.xonCharacter = {0}", label.xonCharacter);
AaruLogging.Debug(MODULE_NAME, "label.xoffCharacter = {0}", label.xoffCharacter);
AaruLogging.Debug(MODULE_NAME, "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
AaruLogging.Debug(MODULE_NAME, "label.dtrDsr = {0}", label.dtrDsr);
AaruLogging.Debug(MODULE_NAME, "label.ctsRts = {0}", label.ctsRts);
AaruLogging.Debug(MODULE_NAME, "label.nullsAfterCr = {0}", label.nullsAfterCr);
AaruLogging.Debug(MODULE_NAME, "label.nullsAfterFF = {0}", label.nullsAfterFF);
AaruLogging.Debug(MODULE_NAME, "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
AaruConsole.Debug(MODULE_NAME, "label.biosErrorReportSerial = {0}", label.biosErrorReportSerial);
AaruLogging.Debug(MODULE_NAME, "label.biosErrorReportSerial = {0}", label.biosErrorReportSerial);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareSerial is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
AaruConsole.Debug(MODULE_NAME, "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
AaruConsole.Debug(MODULE_NAME, "label.selectLine = {0}", label.selectLine);
AaruConsole.Debug(MODULE_NAME, "label.paperEmpty = {0}", label.paperEmpty);
AaruConsole.Debug(MODULE_NAME, "label.faultLine = {0}", label.faultLine);
AaruLogging.Debug(MODULE_NAME, "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
AaruLogging.Debug(MODULE_NAME, "label.selectLine = {0}", label.selectLine);
AaruLogging.Debug(MODULE_NAME, "label.paperEmpty = {0}", label.paperEmpty);
AaruLogging.Debug(MODULE_NAME, "label.faultLine = {0}", label.faultLine);
AaruConsole.Debug(MODULE_NAME, "label.biosErrorReportParallel = {0}", label.biosErrorReportParallel);
AaruLogging.Debug(MODULE_NAME, "label.biosErrorReportParallel = {0}", label.biosErrorReportParallel);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareParallel is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareWinchester is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
AaruConsole.Debug(MODULE_NAME, "label.parkingEnabled = {0}", label.parkingEnabled);
AaruConsole.Debug(MODULE_NAME, "label.formatProtection = {0}", label.formatProtection);
AaruLogging.Debug(MODULE_NAME, "label.parkingEnabled = {0}", label.parkingEnabled);
AaruLogging.Debug(MODULE_NAME, "label.formatProtection = {0}", label.formatProtection);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spareRamDisk is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
for(int i = 0; i < 32; i++)
AaruConsole.Debug(MODULE_NAME, "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
AaruLogging.Debug(MODULE_NAME, "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
for(int i = 0; i < 8; i++)
{
AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].bps = {0}", label.partitions[i].bps, i);
AaruLogging.Debug(MODULE_NAME, "label.partitions[{1}].bps = {0}", label.partitions[i].bps, i);
AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].spc = {0}", label.partitions[i].spc, i);
AaruLogging.Debug(MODULE_NAME, "label.partitions[{1}].spc = {0}", label.partitions[i].spc, i);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].rsectors = {0}",
label.partitions[i].rsectors,
i);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].fats_no = {0}",
label.partitions[i].fats_no,
i);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].root_ent = {0}",
label.partitions[i].root_ent,
i);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].sectors = {0}",
label.partitions[i].sectors,
i);
AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].media = {0}", label.partitions[i].media, i);
AaruLogging.Debug(MODULE_NAME, "label.partitions[{1}].media = {0}", label.partitions[i].media, i);
AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].spfat = {0}", label.partitions[i].spfat, i);
AaruLogging.Debug(MODULE_NAME, "label.partitions[{1}].spfat = {0}", label.partitions[i].spfat, i);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].diskType = {0} ({2})",
label.partitions[i].diskType,
i,
@@ -337,17 +337,17 @@ public sealed class Apricot : IPartition
? _diskTypeCodes[label.partitions[i].diskType]
: Localization.Unknown_disk_type);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.partitions[{1}].startSector = {0}",
label.partitions[i].startSector,
i);
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.spare is null? = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
AaruConsole.Debug(MODULE_NAME, "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
AaruLogging.Debug(MODULE_NAME, "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
// Only hard disks can contain partitions
if(!label.winchester) return false;

32
Aaru.Partitions/Atari.cs
View File

@@ -115,59 +115,59 @@ public sealed class AtariPartitions : IPartition
var sha1Ctx = new Sha1Context();
sha1Ctx.Update(table.Boot);
AaruConsole.Debug(MODULE_NAME, Localization.Boot_code_SHA1_0, sha1Ctx.End());
AaruLogging.Debug(MODULE_NAME, Localization.Boot_code_SHA1_0, sha1Ctx.End());
for(int i = 0; i < 8; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.icdEntries[{0}].flag = 0x{1:X2}"),
i,
(table.IcdEntries[i].Type & 0xFF000000) >> 24);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.icdEntries[{0}].type = 0x{1:X6}"),
i,
table.IcdEntries[i].Type & 0x00FFFFFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.icdEntries[{0}].start = {1}"),
i,
table.IcdEntries[i].Start);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.icdEntries[{0}].length = {1}"),
i,
table.IcdEntries[i].Length);
}
AaruConsole.Debug(MODULE_NAME, "table.size = {0}", table.Size);
AaruLogging.Debug(MODULE_NAME, "table.size = {0}", table.Size);
for(int i = 0; i < 4; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.entries[{0}].flag = 0x{1:X2}"),
i,
(table.Entries[i].Type & 0xFF000000) >> 24);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.entries[{0}].type = 0x{1:X6}"),
i,
table.Entries[i].Type & 0x00FFFFFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.entries[{0}].start = {1}"),
i,
table.Entries[i].Start);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Markup.Escape("table.entries[{0}].length = {1}"),
i,
table.Entries[i].Length);
}
AaruConsole.Debug(MODULE_NAME, "table.badStart = {0}", table.BadStart);
AaruConsole.Debug(MODULE_NAME, "table.badLength = {0}", table.BadLength);
AaruConsole.Debug(MODULE_NAME, "table.checksum = 0x{0:X4}", table.Checksum);
AaruLogging.Debug(MODULE_NAME, "table.badStart = {0}", table.BadStart);
AaruLogging.Debug(MODULE_NAME, "table.badLength = {0}", table.BadLength);
AaruLogging.Debug(MODULE_NAME, "table.checksum = 0x{0:X4}", table.Checksum);
bool validTable = false;
ulong partitionSequence = 0;
@@ -195,7 +195,7 @@ public sealed class AtariPartitions : IPartition
{
if(table.Entries[i].Start + table.Entries[i].Length > imagePlugin.Info.Sectors)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.WARNING_End_of_partition_goes_beyond_device_size);
}
@@ -284,7 +284,7 @@ public sealed class AtariPartitions : IPartition
if(extendedTable.Entries[j].Start + extendedTable.Entries[j].Length > imagePlugin.Info.Sectors)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.WARNING_End_of_partition_goes_beyond_device_size);
}
@@ -353,7 +353,7 @@ public sealed class AtariPartitions : IPartition
if(table.IcdEntries[i].Start > imagePlugin.Info.Sectors) continue;
if(table.IcdEntries[i].Start + table.IcdEntries[i].Length > imagePlugin.Info.Sectors)
AaruConsole.Debug(MODULE_NAME, Localization.WARNING_End_of_partition_goes_beyond_device_size);
AaruLogging.Debug(MODULE_NAME, Localization.WARNING_End_of_partition_goes_beyond_device_size);
ulong sectorSize = imagePlugin.Info.SectorSize;

82
Aaru.Partitions/BSD.cs
View File

@@ -98,7 +98,7 @@ public sealed class BSD : IPartition
Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.BSD_GetInformation_dl_magic_on_sector_0_at_offset_1_equals_2_X8_expected_3_X8,
location + sectorOffset,
@@ -122,52 +122,52 @@ public sealed class BSD : IPartition
if(dl is { d_magic: DISK_CIGAM, d_magic2: DISK_CIGAM }) dl = SwapDiskLabel(dl);
AaruConsole.Debug(MODULE_NAME, "dl.d_type = {0}", dl.d_type);
AaruConsole.Debug(MODULE_NAME, "dl.d_subtype = {0}", dl.d_subtype);
AaruConsole.Debug(MODULE_NAME, "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
AaruConsole.Debug(MODULE_NAME, "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
AaruConsole.Debug(MODULE_NAME, "dl.d_secsize = {0}", dl.d_secsize);
AaruConsole.Debug(MODULE_NAME, "dl.d_nsectors = {0}", dl.d_nsectors);
AaruConsole.Debug(MODULE_NAME, "dl.d_ntracks = {0}", dl.d_ntracks);
AaruConsole.Debug(MODULE_NAME, "dl.d_ncylinders = {0}", dl.d_ncylinders);
AaruConsole.Debug(MODULE_NAME, "dl.d_secpercyl = {0}", dl.d_secpercyl);
AaruConsole.Debug(MODULE_NAME, "dl.d_secperunit = {0}", dl.d_secperunit);
AaruConsole.Debug(MODULE_NAME, "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
AaruConsole.Debug(MODULE_NAME, "dl.d_sparespercyl = {0}", dl.d_sparespercyl);
AaruConsole.Debug(MODULE_NAME, "dl.d_acylinders = {0}", dl.d_acylinders);
AaruConsole.Debug(MODULE_NAME, "dl.d_rpm = {0}", dl.d_rpm);
AaruConsole.Debug(MODULE_NAME, "dl.d_interleave = {0}", dl.d_interleave);
AaruConsole.Debug(MODULE_NAME, "dl.d_trackskew = {0}", dl.d_trackskew);
AaruConsole.Debug(MODULE_NAME, "dl.d_cylskeew = {0}", dl.d_cylskeew);
AaruConsole.Debug(MODULE_NAME, "dl.d_headswitch = {0}", dl.d_headswitch);
AaruConsole.Debug(MODULE_NAME, "dl.d_trkseek = {0}", dl.d_trkseek);
AaruConsole.Debug(MODULE_NAME, "dl.d_flags = {0}", dl.d_flags);
AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[0] = {0}", dl.d_drivedata[0]);
AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[1] = {0}", dl.d_drivedata[1]);
AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[2] = {0}", dl.d_drivedata[2]);
AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[3] = {0}", dl.d_drivedata[3]);
AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[4] = {0}", dl.d_drivedata[4]);
AaruConsole.Debug(MODULE_NAME, "dl.d_spare[0] = {0}", dl.d_spare[0]);
AaruConsole.Debug(MODULE_NAME, "dl.d_spare[1] = {0}", dl.d_spare[1]);
AaruConsole.Debug(MODULE_NAME, "dl.d_spare[2] = {0}", dl.d_spare[2]);
AaruConsole.Debug(MODULE_NAME, "dl.d_spare[3] = {0}", dl.d_spare[3]);
AaruConsole.Debug(MODULE_NAME, "dl.d_spare[4] = {0}", dl.d_spare[4]);
AaruConsole.Debug(MODULE_NAME, "dl.d_magic2 = 0x{0:X8}", dl.d_magic2);
AaruConsole.Debug(MODULE_NAME, "dl.d_checksum = 0x{0:X8}", dl.d_checksum);
AaruConsole.Debug(MODULE_NAME, "dl.d_npartitions = {0}", dl.d_npartitions);
AaruConsole.Debug(MODULE_NAME, "dl.d_bbsize = {0}", dl.d_bbsize);
AaruConsole.Debug(MODULE_NAME, "dl.d_sbsize = {0}", dl.d_sbsize);
AaruLogging.Debug(MODULE_NAME, "dl.d_type = {0}", dl.d_type);
AaruLogging.Debug(MODULE_NAME, "dl.d_subtype = {0}", dl.d_subtype);
AaruLogging.Debug(MODULE_NAME, "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
AaruLogging.Debug(MODULE_NAME, "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
AaruLogging.Debug(MODULE_NAME, "dl.d_secsize = {0}", dl.d_secsize);
AaruLogging.Debug(MODULE_NAME, "dl.d_nsectors = {0}", dl.d_nsectors);
AaruLogging.Debug(MODULE_NAME, "dl.d_ntracks = {0}", dl.d_ntracks);
AaruLogging.Debug(MODULE_NAME, "dl.d_ncylinders = {0}", dl.d_ncylinders);
AaruLogging.Debug(MODULE_NAME, "dl.d_secpercyl = {0}", dl.d_secpercyl);
AaruLogging.Debug(MODULE_NAME, "dl.d_secperunit = {0}", dl.d_secperunit);
AaruLogging.Debug(MODULE_NAME, "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
AaruLogging.Debug(MODULE_NAME, "dl.d_sparespercyl = {0}", dl.d_sparespercyl);
AaruLogging.Debug(MODULE_NAME, "dl.d_acylinders = {0}", dl.d_acylinders);
AaruLogging.Debug(MODULE_NAME, "dl.d_rpm = {0}", dl.d_rpm);
AaruLogging.Debug(MODULE_NAME, "dl.d_interleave = {0}", dl.d_interleave);
AaruLogging.Debug(MODULE_NAME, "dl.d_trackskew = {0}", dl.d_trackskew);
AaruLogging.Debug(MODULE_NAME, "dl.d_cylskeew = {0}", dl.d_cylskeew);
AaruLogging.Debug(MODULE_NAME, "dl.d_headswitch = {0}", dl.d_headswitch);
AaruLogging.Debug(MODULE_NAME, "dl.d_trkseek = {0}", dl.d_trkseek);
AaruLogging.Debug(MODULE_NAME, "dl.d_flags = {0}", dl.d_flags);
AaruLogging.Debug(MODULE_NAME, "dl.d_drivedata[0] = {0}", dl.d_drivedata[0]);
AaruLogging.Debug(MODULE_NAME, "dl.d_drivedata[1] = {0}", dl.d_drivedata[1]);
AaruLogging.Debug(MODULE_NAME, "dl.d_drivedata[2] = {0}", dl.d_drivedata[2]);
AaruLogging.Debug(MODULE_NAME, "dl.d_drivedata[3] = {0}", dl.d_drivedata[3]);
AaruLogging.Debug(MODULE_NAME, "dl.d_drivedata[4] = {0}", dl.d_drivedata[4]);
AaruLogging.Debug(MODULE_NAME, "dl.d_spare[0] = {0}", dl.d_spare[0]);
AaruLogging.Debug(MODULE_NAME, "dl.d_spare[1] = {0}", dl.d_spare[1]);
AaruLogging.Debug(MODULE_NAME, "dl.d_spare[2] = {0}", dl.d_spare[2]);
AaruLogging.Debug(MODULE_NAME, "dl.d_spare[3] = {0}", dl.d_spare[3]);
AaruLogging.Debug(MODULE_NAME, "dl.d_spare[4] = {0}", dl.d_spare[4]);
AaruLogging.Debug(MODULE_NAME, "dl.d_magic2 = 0x{0:X8}", dl.d_magic2);
AaruLogging.Debug(MODULE_NAME, "dl.d_checksum = 0x{0:X8}", dl.d_checksum);
AaruLogging.Debug(MODULE_NAME, "dl.d_npartitions = {0}", dl.d_npartitions);
AaruLogging.Debug(MODULE_NAME, "dl.d_bbsize = {0}", dl.d_bbsize);
AaruLogging.Debug(MODULE_NAME, "dl.d_sbsize = {0}", dl.d_sbsize);
ulong counter = 0;
bool addSectorOffset = false;
for(int i = 0; i < dl.d_npartitions && i < 22; i++)
{
AaruConsole.Debug(MODULE_NAME, "dl.d_partitions[i].p_offset = {0}", dl.d_partitions[i].p_offset);
AaruLogging.Debug(MODULE_NAME, "dl.d_partitions[i].p_offset = {0}", dl.d_partitions[i].p_offset);
AaruConsole.Debug(MODULE_NAME, "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
AaruLogging.Debug(MODULE_NAME, "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dl.d_partitions[i].p_fstype = {0} ({1})",
dl.d_partitions[i].p_fstype,
FSTypeToString(dl.d_partitions[i].p_fstype));
@@ -194,8 +194,8 @@ public sealed class BSD : IPartition
part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
}
AaruConsole.Debug(MODULE_NAME, "part.start = {0}", part.Start);
AaruConsole.Debug(MODULE_NAME, Localization.BSD_GetInformation_Adding_it);
AaruLogging.Debug(MODULE_NAME, "part.start = {0}", part.Start);
AaruLogging.Debug(MODULE_NAME, Localization.BSD_GetInformation_Adding_it);
partitions.Add(part);
counter++;
}

46
Aaru.Partitions/GPT.cs
View File

@@ -79,7 +79,7 @@ public sealed class GuidPartitionTable : IPartition
ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
bool misaligned = false;
AaruConsole.Debug(MODULE_NAME, "hdr.signature = 0x{0:X16}", signature);
AaruLogging.Debug(MODULE_NAME, "hdr.signature = 0x{0:X16}", signature);
if(signature != GPT_MAGIC)
{
@@ -90,11 +90,11 @@ public sealed class GuidPartitionTable : IPartition
if(errno != ErrorNumber.NoError) return false;
signature = BitConverter.ToUInt64(hdrBytes, 512);
AaruConsole.Debug(MODULE_NAME, "hdr.signature @ 0x200 = 0x{0:X16}", signature);
AaruLogging.Debug(MODULE_NAME, "hdr.signature @ 0x200 = 0x{0:X16}", signature);
if(signature == GPT_MAGIC)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_unaligned_signature, signature);
AaruLogging.Debug(MODULE_NAME, Localization.Found_unaligned_signature, signature);
byte[] real = new byte[512];
Array.Copy(hdrBytes, 512, real, 0, 512);
hdrBytes = real;
@@ -116,19 +116,19 @@ public sealed class GuidPartitionTable : IPartition
return false;
}
AaruConsole.Debug(MODULE_NAME, "hdr.revision = 0x{0:X8}", hdr.revision);
AaruConsole.Debug(MODULE_NAME, "hdr.headerSize = {0}", hdr.headerSize);
AaruConsole.Debug(MODULE_NAME, "hdr.headerCrc = 0x{0:X8}", hdr.headerCrc);
AaruConsole.Debug(MODULE_NAME, "hdr.reserved = 0x{0:X8}", hdr.reserved);
AaruConsole.Debug(MODULE_NAME, "hdr.myLBA = {0}", hdr.myLBA);
AaruConsole.Debug(MODULE_NAME, "hdr.alternateLBA = {0}", hdr.alternateLBA);
AaruConsole.Debug(MODULE_NAME, "hdr.firstUsableLBA = {0}", hdr.firstUsableLBA);
AaruConsole.Debug(MODULE_NAME, "hdr.lastUsableLBA = {0}", hdr.lastUsableLBA);
AaruConsole.Debug(MODULE_NAME, "hdr.diskGuid = {0}", hdr.diskGuid);
AaruConsole.Debug(MODULE_NAME, "hdr.entryLBA = {0}", hdr.entryLBA);
AaruConsole.Debug(MODULE_NAME, "hdr.entries = {0}", hdr.entries);
AaruConsole.Debug(MODULE_NAME, "hdr.entriesSize = {0}", hdr.entriesSize);
AaruConsole.Debug(MODULE_NAME, "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
AaruLogging.Debug(MODULE_NAME, "hdr.revision = 0x{0:X8}", hdr.revision);
AaruLogging.Debug(MODULE_NAME, "hdr.headerSize = {0}", hdr.headerSize);
AaruLogging.Debug(MODULE_NAME, "hdr.headerCrc = 0x{0:X8}", hdr.headerCrc);
AaruLogging.Debug(MODULE_NAME, "hdr.reserved = 0x{0:X8}", hdr.reserved);
AaruLogging.Debug(MODULE_NAME, "hdr.myLBA = {0}", hdr.myLBA);
AaruLogging.Debug(MODULE_NAME, "hdr.alternateLBA = {0}", hdr.alternateLBA);
AaruLogging.Debug(MODULE_NAME, "hdr.firstUsableLBA = {0}", hdr.firstUsableLBA);
AaruLogging.Debug(MODULE_NAME, "hdr.lastUsableLBA = {0}", hdr.lastUsableLBA);
AaruLogging.Debug(MODULE_NAME, "hdr.diskGuid = {0}", hdr.diskGuid);
AaruLogging.Debug(MODULE_NAME, "hdr.entryLBA = {0}", hdr.entryLBA);
AaruLogging.Debug(MODULE_NAME, "hdr.entries = {0}", hdr.entries);
AaruLogging.Debug(MODULE_NAME, "hdr.entriesSize = {0}", hdr.entriesSize);
AaruLogging.Debug(MODULE_NAME, "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
if(hdr.signature != GPT_MAGIC) return false;
@@ -184,12 +184,12 @@ public sealed class GuidPartitionTable : IPartition
foreach(Entry entry in entries.Where(entry => entry.partitionType != Guid.Empty &&
entry.partitionId != Guid.Empty))
{
AaruConsole.Debug(MODULE_NAME, "entry.partitionType = {0}", entry.partitionType);
AaruConsole.Debug(MODULE_NAME, "entry.partitionId = {0}", entry.partitionId);
AaruConsole.Debug(MODULE_NAME, "entry.startLBA = {0}", entry.startLBA);
AaruConsole.Debug(MODULE_NAME, "entry.endLBA = {0}", entry.endLBA);
AaruConsole.Debug(MODULE_NAME, "entry.attributes = 0x{0:X16}", entry.attributes);
AaruConsole.Debug(MODULE_NAME, "entry.name = {0}", entry.name);
AaruLogging.Debug(MODULE_NAME, "entry.partitionType = {0}", entry.partitionType);
AaruLogging.Debug(MODULE_NAME, "entry.partitionId = {0}", entry.partitionId);
AaruLogging.Debug(MODULE_NAME, "entry.startLBA = {0}", entry.startLBA);
AaruLogging.Debug(MODULE_NAME, "entry.endLBA = {0}", entry.endLBA);
AaruLogging.Debug(MODULE_NAME, "entry.attributes = 0x{0:X16}", entry.attributes);
AaruLogging.Debug(MODULE_NAME, "entry.name = {0}", entry.name);
if(entry.startLBA / divisor > imagePlugin.Info.Sectors || entry.endLBA / divisor > imagePlugin.Info.Sectors)
return false;
@@ -207,7 +207,7 @@ public sealed class GuidPartitionTable : IPartition
Scheme = Name
};
AaruConsole.Debug(MODULE_NAME, "part.PartitionType = {0}", part.Type);
AaruLogging.Debug(MODULE_NAME, "part.PartitionType = {0}", part.Type);
partitions.Add(part);
}

18
Aaru.Partitions/Human68k.cs
View File

@@ -71,7 +71,7 @@ public sealed class Human68K : IPartition
ulong sectsPerUnit;
ErrorNumber errno;
AaruConsole.Debug(MODULE_NAME, "sectorSize = {0}", imagePlugin.Info.SectorSize);
AaruLogging.Debug(MODULE_NAME, "sectorSize = {0}", imagePlugin.Info.SectorSize);
if(sectorOffset + 4 >= imagePlugin.Info.Sectors) return false;
@@ -100,29 +100,29 @@ public sealed class Human68K : IPartition
Table table = Marshal.ByteArrayToStructureBigEndian<Table>(sector);
AaruConsole.Debug(MODULE_NAME, "table.magic = {0:X4}", table.magic);
AaruLogging.Debug(MODULE_NAME, "table.magic = {0:X4}", table.magic);
if(table.magic != X68K_MAGIC) return false;
for(int i = 0; i < table.entries.Length; i++)
table.entries[i] = (Entry)Marshal.SwapStructureMembersEndian(table.entries[i]);
AaruConsole.Debug(MODULE_NAME, "table.size = {0:X4}", table.size);
AaruConsole.Debug(MODULE_NAME, "table.size2 = {0:X4}", table.size2);
AaruConsole.Debug(MODULE_NAME, "table.unknown = {0:X4}", table.unknown);
AaruLogging.Debug(MODULE_NAME, "table.size = {0:X4}", table.size);
AaruLogging.Debug(MODULE_NAME, "table.size2 = {0:X4}", table.size2);
AaruLogging.Debug(MODULE_NAME, "table.unknown = {0:X4}", table.unknown);
ulong counter = 0;
foreach(Entry entry in table.entries)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"entry.name = {0}",
StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
AaruConsole.Debug(MODULE_NAME, "entry.stateStart = {0}", entry.stateStart);
AaruConsole.Debug(MODULE_NAME, "entry.length = {0}", entry.length);
AaruLogging.Debug(MODULE_NAME, "entry.stateStart = {0}", entry.stateStart);
AaruLogging.Debug(MODULE_NAME, "entry.length = {0}", entry.length);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"sectsPerUnit = {0} {1}",
sectsPerUnit,
imagePlugin.Info.SectorSize);

90
Aaru.Partitions/MBR.cs
View File

@@ -351,8 +351,8 @@ public sealed class MBR : IPartition
DiskManagerMasterBootRecord mbrOntrack =
Marshal.ByteArrayToStructureLittleEndian<DiskManagerMasterBootRecord>(sector);
AaruConsole.Debug(MODULE_NAME, "xmlmedia = {0}", imagePlugin.Info.MetadataMediaType);
AaruConsole.Debug(MODULE_NAME, "mbr.magic = {0:X4}", mbr.magic);
AaruLogging.Debug(MODULE_NAME, "xmlmedia = {0}", imagePlugin.Info.MetadataMediaType);
AaruLogging.Debug(MODULE_NAME, "mbr.magic = {0:X4}", mbr.magic);
if(mbr.magic != MBR_MAGIC) return false; // Not MBR
@@ -362,7 +362,7 @@ public sealed class MBR : IPartition
ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
AaruConsole.Debug(MODULE_NAME, "gpt.signature = 0x{0:X16}", signature);
AaruLogging.Debug(MODULE_NAME, "gpt.signature = 0x{0:X16}", signature);
if(signature == GPT_MAGIC) return false;
@@ -373,7 +373,7 @@ public sealed class MBR : IPartition
if(errno != ErrorNumber.NoError) return false;
signature = BitConverter.ToUInt64(hdrBytes, 512);
AaruConsole.Debug(MODULE_NAME, "gpt.signature @ 0x200 = 0x{0:X16}", signature);
AaruLogging.Debug(MODULE_NAME, "gpt.signature @ 0x200 = 0x{0:X16}", signature);
if(signature == GPT_MAGIC) return false;
}
@@ -454,21 +454,21 @@ public sealed class MBR : IPartition
// Some buggy implementations do some rounding errors getting a few sectors beyond device size
if(lbaStart + lbaSectors > imagePlugin.Info.Sectors) lbaSectors = imagePlugin.Info.Sectors - lbaStart;
AaruConsole.Debug(MODULE_NAME, "entry.status {0}", entry.status);
AaruConsole.Debug(MODULE_NAME, "entry.type {0}", entry.type);
AaruConsole.Debug(MODULE_NAME, "entry.lba_start {0}", entry.lba_start);
AaruConsole.Debug(MODULE_NAME, "entry.lba_sectors {0}", entry.lba_sectors);
AaruConsole.Debug(MODULE_NAME, "entry.start_cylinder {0}", startCylinder);
AaruConsole.Debug(MODULE_NAME, "entry.start_head {0}", entry.start_head);
AaruConsole.Debug(MODULE_NAME, "entry.start_sector {0}", startSector);
AaruConsole.Debug(MODULE_NAME, "entry.end_cylinder {0}", endCylinder);
AaruConsole.Debug(MODULE_NAME, "entry.end_head {0}", entry.end_head);
AaruConsole.Debug(MODULE_NAME, "entry.end_sector {0}", endSector);
AaruLogging.Debug(MODULE_NAME, "entry.status {0}", entry.status);
AaruLogging.Debug(MODULE_NAME, "entry.type {0}", entry.type);
AaruLogging.Debug(MODULE_NAME, "entry.lba_start {0}", entry.lba_start);
AaruLogging.Debug(MODULE_NAME, "entry.lba_sectors {0}", entry.lba_sectors);
AaruLogging.Debug(MODULE_NAME, "entry.start_cylinder {0}", startCylinder);
AaruLogging.Debug(MODULE_NAME, "entry.start_head {0}", entry.start_head);
AaruLogging.Debug(MODULE_NAME, "entry.start_sector {0}", startSector);
AaruLogging.Debug(MODULE_NAME, "entry.end_cylinder {0}", endCylinder);
AaruLogging.Debug(MODULE_NAME, "entry.end_head {0}", entry.end_head);
AaruLogging.Debug(MODULE_NAME, "entry.end_sector {0}", endSector);
AaruConsole.Debug(MODULE_NAME, "entry.minix = {0}", minix);
AaruLogging.Debug(MODULE_NAME, "entry.minix = {0}", minix);
AaruConsole.Debug(MODULE_NAME, "lba_start {0}", lbaStart);
AaruConsole.Debug(MODULE_NAME, "lba_sectors {0}", lbaSectors);
AaruLogging.Debug(MODULE_NAME, "lba_start {0}", lbaStart);
AaruLogging.Debug(MODULE_NAME, "lba_sectors {0}", lbaSectors);
if(valid && minix) // Let's mix the fun
{
@@ -507,7 +507,7 @@ public sealed class MBR : IPartition
}
}
AaruConsole.Debug(MODULE_NAME, "entry.extended = {0}", extended);
AaruLogging.Debug(MODULE_NAME, "entry.extended = {0}", extended);
if(!extended) continue;
@@ -522,7 +522,7 @@ public sealed class MBR : IPartition
ExtendedBootRecord ebr = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
AaruConsole.Debug(MODULE_NAME, "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
AaruLogging.Debug(MODULE_NAME, "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
if(ebr.magic != MBR_MAGIC) break;
@@ -539,16 +539,16 @@ public sealed class MBR : IPartition
ulong extSectors = ebrEntry.lba_sectors;
bool extMinix = false;
AaruConsole.Debug(MODULE_NAME, "ebr_entry.status {0}", ebrEntry.status);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.type {0}", ebrEntry.type);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.lba_start {0}", ebrEntry.lba_start);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.lba_sectors {0}", ebrEntry.lba_sectors);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_cylinder {0}", startCylinder);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_head {0}", ebrEntry.start_head);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_sector {0}", startSector);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_cylinder {0}", endCylinder);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_head {0}", ebrEntry.end_head);
AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_sector {0}", endSector);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.status {0}", ebrEntry.status);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.type {0}", ebrEntry.type);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.lba_start {0}", ebrEntry.lba_start);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.lba_sectors {0}", ebrEntry.lba_sectors);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.start_cylinder {0}", startCylinder);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.start_head {0}", ebrEntry.start_head);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.start_sector {0}", startSector);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.end_cylinder {0}", endCylinder);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.end_head {0}", ebrEntry.end_head);
AaruLogging.Debug(MODULE_NAME, "ebr_entry.end_sector {0}", endSector);
// Let's start the fun...
extValid &= ebrEntry.status is 0x00 or 0x80;
@@ -585,8 +585,8 @@ public sealed class MBR : IPartition
extStart /= divider;
extSectors /= divider;
AaruConsole.Debug(MODULE_NAME, "ext_start {0}", extStart);
AaruConsole.Debug(MODULE_NAME, "ext_sectors {0}", extSectors);
AaruLogging.Debug(MODULE_NAME, "ext_start {0}", extStart);
AaruLogging.Debug(MODULE_NAME, "ext_sectors {0}", extSectors);
if(ebrEntry.type is 0x05 or 0x0F or 0x15 or 0x1F or 0x85 or 0x91 or 0x9B or 0xC5 or 0xCF or 0xD5)
{
@@ -640,7 +640,7 @@ public sealed class MBR : IPartition
partitions.Add(part);
}
AaruConsole.Debug(MODULE_NAME, "next_start {0}", nextStart);
AaruLogging.Debug(MODULE_NAME, "next_start {0}", nextStart);
processingExtended &= nextStart != 0;
processingExtended &= nextStart <= imagePlugin.Info.Sectors;
lbaStart = nextStart;
@@ -664,7 +664,7 @@ public sealed class MBR : IPartition
ExtendedBootRecord mnx = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
AaruConsole.Debug(MODULE_NAME, "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
AaruLogging.Debug(MODULE_NAME, "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
if(mnx.magic != MBR_MAGIC) return false;
@@ -680,16 +680,16 @@ public sealed class MBR : IPartition
ulong mnxStart = mnxEntry.lba_start;
ulong mnxSectors = mnxEntry.lba_sectors;
AaruConsole.Debug(MODULE_NAME, "mnx_entry.status {0}", mnxEntry.status);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.type {0}", mnxEntry.type);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.lba_start {0}", mnxEntry.lba_start);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.lba_sectors {0}", mnxEntry.lba_sectors);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_cylinder {0}", startCylinder);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_head {0}", mnxEntry.start_head);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_sector {0}", startSector);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_cylinder {0}", endCylinder);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_head {0}", mnxEntry.end_head);
AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_sector {0}", endSector);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.status {0}", mnxEntry.status);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.type {0}", mnxEntry.type);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.lba_start {0}", mnxEntry.lba_start);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.lba_sectors {0}", mnxEntry.lba_sectors);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.start_cylinder {0}", startCylinder);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.start_head {0}", mnxEntry.start_head);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.start_sector {0}", startSector);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.end_cylinder {0}", endCylinder);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.end_head {0}", mnxEntry.end_head);
AaruLogging.Debug(MODULE_NAME, "mnx_entry.end_sector {0}", endSector);
mnxValid &= mnxEntry.status is 0x00 or 0x80;
mnxValid &= mnxEntry.type is 0x81 or 0x80;
@@ -723,8 +723,8 @@ public sealed class MBR : IPartition
mnxStart /= divider;
mnxSectors /= divider;
AaruConsole.Debug(MODULE_NAME, "mnx_start {0}", mnxStart);
AaruConsole.Debug(MODULE_NAME, "mnx_sectors {0}", mnxSectors);
AaruLogging.Debug(MODULE_NAME, "mnx_start {0}", mnxStart);
AaruLogging.Debug(MODULE_NAME, "mnx_sectors {0}", mnxSectors);
if(!mnxValid) continue;

78
Aaru.Partitions/NeXT.cs
View File

@@ -124,49 +124,49 @@ public sealed class NeXTDisklabel : IPartition
label.dl_dt = Marshal.ByteArrayToStructureBigEndian<DiskTab>(disktabB);
label.dl_dt.d_partitions = new Entry[8];
AaruConsole.Debug(MODULE_NAME, "label.dl_version = 0x{0:X8}", label.dl_version);
AaruConsole.Debug(MODULE_NAME, "label.dl_label_blkno = {0}", label.dl_label_blkno);
AaruConsole.Debug(MODULE_NAME, "label.dl_size = {0}", label.dl_size);
AaruLogging.Debug(MODULE_NAME, "label.dl_version = 0x{0:X8}", label.dl_version);
AaruLogging.Debug(MODULE_NAME, "label.dl_label_blkno = {0}", label.dl_label_blkno);
AaruLogging.Debug(MODULE_NAME, "label.dl_size = {0}", label.dl_size);
AaruConsole.Debug(MODULE_NAME, "label.dl_label = \"{0}\"", StringHandlers.CToString(label.dl_label));
AaruLogging.Debug(MODULE_NAME, "label.dl_label = \"{0}\"", StringHandlers.CToString(label.dl_label));
AaruConsole.Debug(MODULE_NAME, "label.dl_flags = {0}", label.dl_flags);
AaruConsole.Debug(MODULE_NAME, "label.dl_tag = 0x{0:X8}", label.dl_tag);
AaruLogging.Debug(MODULE_NAME, "label.dl_flags = {0}", label.dl_flags);
AaruLogging.Debug(MODULE_NAME, "label.dl_tag = 0x{0:X8}", label.dl_tag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_name = \"{0}\"",
StringHandlers.CToString(label.dl_dt.d_name));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_type = \"{0}\"",
StringHandlers.CToString(label.dl_dt.d_type));
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_secsize = {0}", label.dl_dt.d_secsize);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ntracks = {0}", label.dl_dt.d_ntracks);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_nsectors = {0}", label.dl_dt.d_nsectors);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rpm = {0}", label.dl_dt.d_rpm);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_front = {0}", label.dl_dt.d_front);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_back = {0}", label.dl_dt.d_back);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ngroups = {0}", label.dl_dt.d_ngroups);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_size = {0}", label.dl_dt.d_ag_size);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_alts = {0}", label.dl_dt.d_ag_alts);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_off = {0}", label.dl_dt.d_ag_off);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_secsize = {0}", label.dl_dt.d_secsize);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ntracks = {0}", label.dl_dt.d_ntracks);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_nsectors = {0}", label.dl_dt.d_nsectors);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_rpm = {0}", label.dl_dt.d_rpm);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_front = {0}", label.dl_dt.d_front);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_back = {0}", label.dl_dt.d_back);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ngroups = {0}", label.dl_dt.d_ngroups);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ag_size = {0}", label.dl_dt.d_ag_size);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ag_alts = {0}", label.dl_dt.d_ag_alts);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_ag_off = {0}", label.dl_dt.d_ag_off);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[0] = {0}", label.dl_dt.d_boot0_blkno[0]);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[0] = {0}", label.dl_dt.d_boot0_blkno[0]);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[1] = {0}", label.dl_dt.d_boot0_blkno[1]);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[1] = {0}", label.dl_dt.d_boot0_blkno[1]);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_bootfile = \"{0}\"",
StringHandlers.CToString(label.dl_dt.d_bootfile));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_hostname = \"{0}\"",
StringHandlers.CToString(label.dl_dt.d_hostname));
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rwpartition = {0}", label.dl_dt.d_rwpartition);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_rwpartition = {0}", label.dl_dt.d_rwpartition);
for(int i = 0; i < 8; i++)
{
@@ -174,62 +174,62 @@ public sealed class NeXTDisklabel : IPartition
Array.Copy(labelSector, 44 + 146 + 44 * i, partB, 0, 44);
label.dl_dt.d_partitions[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(partB);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_base = {1}",
i,
label.dl_dt.d_partitions[i].p_base);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_size = {1}",
i,
label.dl_dt.d_partitions[i].p_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_bsize = {1}",
i,
label.dl_dt.d_partitions[i].p_bsize);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_fsize = {1}",
i,
label.dl_dt.d_partitions[i].p_fsize);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_opt = {1}",
i,
label.dl_dt.d_partitions[i].p_opt);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_cpg = {1}",
i,
label.dl_dt.d_partitions[i].p_cpg);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_density = {1}",
i,
label.dl_dt.d_partitions[i].p_density);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_minfree = {1}",
i,
label.dl_dt.d_partitions[i].p_minfree);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_newfs = {1}",
i,
label.dl_dt.d_partitions[i].p_newfs);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_mountpt = \"{1}\"",
i,
StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_automnt = {1}",
i,
label.dl_dt.d_partitions[i].p_automnt);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"label.dl_dt.d_partitions[{0}].p_type = \"{1}\"",
i,
StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
@@ -257,11 +257,11 @@ public sealed class NeXTDisklabel : IPartition
if(part.Start + part.Length > imagePlugin.Info.Sectors)
{
AaruConsole.Debug(MODULE_NAME, Localization.Partition_bigger_than_device_reducing);
AaruLogging.Debug(MODULE_NAME, Localization.Partition_bigger_than_device_reducing);
part.Length = imagePlugin.Info.Sectors - part.Start;
part.Size = part.Length * sectorSize;
AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.Length);
AaruLogging.Debug(MODULE_NAME, "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.Length);
}
sb.AppendFormat(Localization._0_bytes_per_block, label.dl_dt.d_partitions[i].p_bsize).AppendLine();

42
Aaru.Partitions/PC98.cs
View File

@@ -83,21 +83,21 @@ public sealed class PC98 : IPartition
foreach(Partition entry in table.entries)
{
AaruConsole.Debug(MODULE_NAME, "entry.dp_mid = {0}", entry.dp_mid);
AaruConsole.Debug(MODULE_NAME, "entry.dp_sid = {0}", entry.dp_sid);
AaruConsole.Debug(MODULE_NAME, "entry.dp_dum1 = {0}", entry.dp_dum1);
AaruConsole.Debug(MODULE_NAME, "entry.dp_dum2 = {0}", entry.dp_dum2);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_sct = {0}", entry.dp_ipl_sct);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_cyl = {0}", entry.dp_ipl_cyl);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ssect = {0}", entry.dp_ssect);
AaruConsole.Debug(MODULE_NAME, "entry.dp_shd = {0}", entry.dp_shd);
AaruConsole.Debug(MODULE_NAME, "entry.dp_scyl = {0}", entry.dp_scyl);
AaruConsole.Debug(MODULE_NAME, "entry.dp_esect = {0}", entry.dp_esect);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ehd = {0}", entry.dp_ehd);
AaruConsole.Debug(MODULE_NAME, "entry.dp_ecyl = {0}", entry.dp_ecyl);
AaruLogging.Debug(MODULE_NAME, "entry.dp_mid = {0}", entry.dp_mid);
AaruLogging.Debug(MODULE_NAME, "entry.dp_sid = {0}", entry.dp_sid);
AaruLogging.Debug(MODULE_NAME, "entry.dp_dum1 = {0}", entry.dp_dum1);
AaruLogging.Debug(MODULE_NAME, "entry.dp_dum2 = {0}", entry.dp_dum2);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ipl_sct = {0}", entry.dp_ipl_sct);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ipl_cyl = {0}", entry.dp_ipl_cyl);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ssect = {0}", entry.dp_ssect);
AaruLogging.Debug(MODULE_NAME, "entry.dp_shd = {0}", entry.dp_shd);
AaruLogging.Debug(MODULE_NAME, "entry.dp_scyl = {0}", entry.dp_scyl);
AaruLogging.Debug(MODULE_NAME, "entry.dp_esect = {0}", entry.dp_esect);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ehd = {0}", entry.dp_ehd);
AaruLogging.Debug(MODULE_NAME, "entry.dp_ecyl = {0}", entry.dp_ecyl);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"entry.dp_name = \"{0}\"",
StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
@@ -136,13 +136,13 @@ public sealed class PC98 : IPartition
part.Size = part.Length * imagePlugin.Info.SectorSize;
AaruConsole.Debug(MODULE_NAME, "part.Start = {0}", part.Start);
AaruConsole.Debug(MODULE_NAME, "part.Type = {0}", part.Type);
AaruConsole.Debug(MODULE_NAME, "part.Name = {0}", part.Name);
AaruConsole.Debug(MODULE_NAME, "part.Sequence = {0}", part.Sequence);
AaruConsole.Debug(MODULE_NAME, "part.Offset = {0}", part.Offset);
AaruConsole.Debug(MODULE_NAME, "part.Length = {0}", part.Length);
AaruConsole.Debug(MODULE_NAME, "part.Size = {0}", part.Size);
AaruLogging.Debug(MODULE_NAME, "part.Start = {0}", part.Start);
AaruLogging.Debug(MODULE_NAME, "part.Type = {0}", part.Type);
AaruLogging.Debug(MODULE_NAME, "part.Name = {0}", part.Name);
AaruLogging.Debug(MODULE_NAME, "part.Sequence = {0}", part.Sequence);
AaruLogging.Debug(MODULE_NAME, "part.Offset = {0}", part.Offset);
AaruLogging.Debug(MODULE_NAME, "part.Length = {0}", part.Length);
AaruLogging.Debug(MODULE_NAME, "part.Size = {0}", part.Size);
if((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44 ||
part.Start >= imagePlugin.Info.Sectors ||

288
Aaru.Partitions/RDB.cs
View File

@@ -214,11 +214,11 @@ public sealed class AmigaRigidDiskBlock : IPartition
uint magic = BigEndianBitConverter.ToUInt32(tmpSector, 0);
AaruConsole.Debug(MODULE_NAME, Localization.Possible_magic_at_block_0_is_1_X8, rdbBlock, magic);
AaruLogging.Debug(MODULE_NAME, Localization.Possible_magic_at_block_0_is_1_X8, rdbBlock, magic);
if(magic == RIGID_DISK_BLOCK_MAGIC)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_RDB_magic_at_block_0, rdbBlock);
AaruLogging.Debug(MODULE_NAME, Localization.Found_RDB_magic_at_block_0, rdbBlock);
foundRdb = true;
@@ -310,61 +310,61 @@ public sealed class AmigaRigidDiskBlock : IPartition
rdb.Reserved24 = BigEndianBitConverter.ToUInt32(sector, 0xF8);
rdb.Reserved25 = BigEndianBitConverter.ToUInt32(sector, 0xFC);
AaruConsole.Debug(MODULE_NAME, "RDB.magic = 0x{0:X8}", rdb.Magic);
AaruConsole.Debug(MODULE_NAME, "RDB.size = {0} longs, {1} bytes", rdb.Size, rdb.Size * 4);
AaruConsole.Debug(MODULE_NAME, "RDB.checksum = 0x{0:X8}", rdb.Checksum);
AaruConsole.Debug(MODULE_NAME, "RDB.targetID = {0}", rdb.TargetId);
AaruConsole.Debug(MODULE_NAME, "RDB.block_size = {0}", rdb.BlockSize);
AaruConsole.Debug(MODULE_NAME, "RDB.badblock_ptr = {0}", rdb.BadblockPtr);
AaruConsole.Debug(MODULE_NAME, "RDB.partition_ptr = {0}", rdb.PartitionPtr);
AaruConsole.Debug(MODULE_NAME, "RDB.fsheader_ptr = {0}", rdb.FsheaderPtr);
AaruConsole.Debug(MODULE_NAME, "RDB.driveinitcode = {0}", rdb.Driveinitcode);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved1 = 0x{0:X8}", rdb.Reserved1);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved2 = 0x{0:X8}", rdb.Reserved2);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved3 = 0x{0:X8}", rdb.Reserved3);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved4 = 0x{0:X8}", rdb.Reserved4);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved5 = 0x{0:X8}", rdb.Reserved5);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved6 = 0x{0:X8}", rdb.Reserved6);
AaruConsole.Debug(MODULE_NAME, "RDB.cylinders = {0}", rdb.Cylinders);
AaruConsole.Debug(MODULE_NAME, "RDB.spt = {0}", rdb.Spt);
AaruConsole.Debug(MODULE_NAME, "RDB.heads = {0}", rdb.Heads);
AaruConsole.Debug(MODULE_NAME, "RDB.interleave = {0}", rdb.Interleave);
AaruConsole.Debug(MODULE_NAME, "RDB.parking = {0}", rdb.Parking);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved7 = 0x{0:X8}", rdb.Reserved7);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved8 = 0x{0:X8}", rdb.Reserved8);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved9 = 0x{0:X8}", rdb.Reserved9);
AaruConsole.Debug(MODULE_NAME, "RDB.writeprecomp = {0}", rdb.Writeprecomp);
AaruConsole.Debug(MODULE_NAME, "RDB.reducedwrite = {0}", rdb.Reducedwrite);
AaruConsole.Debug(MODULE_NAME, "RDB.steprate = {0}", rdb.Steprate);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved10 = 0x{0:X8}", rdb.Reserved10);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved11 = 0x{0:X8}", rdb.Reserved11);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved12 = 0x{0:X8}", rdb.Reserved12);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved13 = 0x{0:X8}", rdb.Reserved13);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved14 = 0x{0:X8}", rdb.Reserved14);
AaruConsole.Debug(MODULE_NAME, "RDB.RDBBlockLow = {0}", rdb.RdbBlockLow);
AaruConsole.Debug(MODULE_NAME, "RDB.RDBBlockHigh = {0}", rdb.RdbBlockHigh);
AaruConsole.Debug(MODULE_NAME, "RDB.LowCylinder = {0}", rdb.LowCylinder);
AaruConsole.Debug(MODULE_NAME, "RDB.HighCylinder = {0}", rdb.HighCylinder);
AaruConsole.Debug(MODULE_NAME, "RDB.CylBlocks = {0}", rdb.CylBlocks);
AaruConsole.Debug(MODULE_NAME, "RDB.AutoParkSeconds = {0}", rdb.AutoParkSeconds);
AaruConsole.Debug(MODULE_NAME, "RDB.HighCylinder = {0}", rdb.HighCylinder);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved15 = 0x{0:X8}", rdb.Reserved15);
AaruConsole.Debug(MODULE_NAME, "RDB.diskVendor = \"{0}\"", rdb.DiskVendor);
AaruConsole.Debug(MODULE_NAME, "RDB.diskProduct = \"{0}\"", rdb.DiskProduct);
AaruConsole.Debug(MODULE_NAME, "RDB.diskRevision = \"{0}\"", rdb.DiskRevision);
AaruConsole.Debug(MODULE_NAME, "RDB.controllerVendor = \"{0}\"", rdb.ControllerVendor);
AaruConsole.Debug(MODULE_NAME, "RDB.controllerProduct = \"{0}\"", rdb.ControllerProduct);
AaruConsole.Debug(MODULE_NAME, "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved16 = 0x{0:X8}", rdb.Reserved16);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved17 = 0x{0:X8}", rdb.Reserved17);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved18 = 0x{0:X8}", rdb.Reserved18);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved19 = 0x{0:X8}", rdb.Reserved19);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved20 = 0x{0:X8}", rdb.Reserved20);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved21 = 0x{0:X8}", rdb.Reserved21);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved22 = 0x{0:X8}", rdb.Reserved22);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved23 = 0x{0:X8}", rdb.Reserved23);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved24 = 0x{0:X8}", rdb.Reserved24);
AaruConsole.Debug(MODULE_NAME, "RDB.reserved25 = 0x{0:X8}", rdb.Reserved25);
AaruLogging.Debug(MODULE_NAME, "RDB.magic = 0x{0:X8}", rdb.Magic);
AaruLogging.Debug(MODULE_NAME, "RDB.size = {0} longs, {1} bytes", rdb.Size, rdb.Size * 4);
AaruLogging.Debug(MODULE_NAME, "RDB.checksum = 0x{0:X8}", rdb.Checksum);
AaruLogging.Debug(MODULE_NAME, "RDB.targetID = {0}", rdb.TargetId);
AaruLogging.Debug(MODULE_NAME, "RDB.block_size = {0}", rdb.BlockSize);
AaruLogging.Debug(MODULE_NAME, "RDB.badblock_ptr = {0}", rdb.BadblockPtr);
AaruLogging.Debug(MODULE_NAME, "RDB.partition_ptr = {0}", rdb.PartitionPtr);
AaruLogging.Debug(MODULE_NAME, "RDB.fsheader_ptr = {0}", rdb.FsheaderPtr);
AaruLogging.Debug(MODULE_NAME, "RDB.driveinitcode = {0}", rdb.Driveinitcode);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved1 = 0x{0:X8}", rdb.Reserved1);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved2 = 0x{0:X8}", rdb.Reserved2);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved3 = 0x{0:X8}", rdb.Reserved3);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved4 = 0x{0:X8}", rdb.Reserved4);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved5 = 0x{0:X8}", rdb.Reserved5);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved6 = 0x{0:X8}", rdb.Reserved6);
AaruLogging.Debug(MODULE_NAME, "RDB.cylinders = {0}", rdb.Cylinders);
AaruLogging.Debug(MODULE_NAME, "RDB.spt = {0}", rdb.Spt);
AaruLogging.Debug(MODULE_NAME, "RDB.heads = {0}", rdb.Heads);
AaruLogging.Debug(MODULE_NAME, "RDB.interleave = {0}", rdb.Interleave);
AaruLogging.Debug(MODULE_NAME, "RDB.parking = {0}", rdb.Parking);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved7 = 0x{0:X8}", rdb.Reserved7);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved8 = 0x{0:X8}", rdb.Reserved8);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved9 = 0x{0:X8}", rdb.Reserved9);
AaruLogging.Debug(MODULE_NAME, "RDB.writeprecomp = {0}", rdb.Writeprecomp);
AaruLogging.Debug(MODULE_NAME, "RDB.reducedwrite = {0}", rdb.Reducedwrite);
AaruLogging.Debug(MODULE_NAME, "RDB.steprate = {0}", rdb.Steprate);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved10 = 0x{0:X8}", rdb.Reserved10);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved11 = 0x{0:X8}", rdb.Reserved11);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved12 = 0x{0:X8}", rdb.Reserved12);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved13 = 0x{0:X8}", rdb.Reserved13);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved14 = 0x{0:X8}", rdb.Reserved14);
AaruLogging.Debug(MODULE_NAME, "RDB.RDBBlockLow = {0}", rdb.RdbBlockLow);
AaruLogging.Debug(MODULE_NAME, "RDB.RDBBlockHigh = {0}", rdb.RdbBlockHigh);
AaruLogging.Debug(MODULE_NAME, "RDB.LowCylinder = {0}", rdb.LowCylinder);
AaruLogging.Debug(MODULE_NAME, "RDB.HighCylinder = {0}", rdb.HighCylinder);
AaruLogging.Debug(MODULE_NAME, "RDB.CylBlocks = {0}", rdb.CylBlocks);
AaruLogging.Debug(MODULE_NAME, "RDB.AutoParkSeconds = {0}", rdb.AutoParkSeconds);
AaruLogging.Debug(MODULE_NAME, "RDB.HighCylinder = {0}", rdb.HighCylinder);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved15 = 0x{0:X8}", rdb.Reserved15);
AaruLogging.Debug(MODULE_NAME, "RDB.diskVendor = \"{0}\"", rdb.DiskVendor);
AaruLogging.Debug(MODULE_NAME, "RDB.diskProduct = \"{0}\"", rdb.DiskProduct);
AaruLogging.Debug(MODULE_NAME, "RDB.diskRevision = \"{0}\"", rdb.DiskRevision);
AaruLogging.Debug(MODULE_NAME, "RDB.controllerVendor = \"{0}\"", rdb.ControllerVendor);
AaruLogging.Debug(MODULE_NAME, "RDB.controllerProduct = \"{0}\"", rdb.ControllerProduct);
AaruLogging.Debug(MODULE_NAME, "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved16 = 0x{0:X8}", rdb.Reserved16);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved17 = 0x{0:X8}", rdb.Reserved17);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved18 = 0x{0:X8}", rdb.Reserved18);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved19 = 0x{0:X8}", rdb.Reserved19);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved20 = 0x{0:X8}", rdb.Reserved20);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved21 = 0x{0:X8}", rdb.Reserved21);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved22 = 0x{0:X8}", rdb.Reserved22);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved23 = 0x{0:X8}", rdb.Reserved23);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved24 = 0x{0:X8}", rdb.Reserved24);
AaruLogging.Debug(MODULE_NAME, "RDB.reserved25 = 0x{0:X8}", rdb.Reserved25);
// Reading BadBlock list
List<BadBlockList> badBlockChain = [];
@@ -372,7 +372,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
while(nextBlock != 0xFFFFFFFF)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Going_to_block_0_in_search_of_a_BadBlock_block,
nextBlock);
@@ -384,7 +384,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
if(magic != BAD_BLOCK_LIST_MAGIC) break;
AaruConsole.Debug(MODULE_NAME, Localization.Found_BadBlock_block);
AaruLogging.Debug(MODULE_NAME, Localization.Found_BadBlock_block);
var chainEntry = new BadBlockList
{
@@ -399,17 +399,17 @@ public sealed class AmigaRigidDiskBlock : IPartition
ulong entries = (chainEntry.Size - 6) / 2;
chainEntry.BlockPairs = new BadBlockEntry[entries];
AaruConsole.Debug(MODULE_NAME, "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
AaruLogging.Debug(MODULE_NAME, "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"chainEntry.size = {0} longs, {1} bytes",
chainEntry.Size,
chainEntry.Size * 4);
AaruConsole.Debug(MODULE_NAME, "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
AaruConsole.Debug(MODULE_NAME, "chainEntry.targetID = {0}", chainEntry.TargetId);
AaruConsole.Debug(MODULE_NAME, "chainEntry.next_ptr = {0}", chainEntry.NextPtr);
AaruConsole.Debug(MODULE_NAME, "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
AaruLogging.Debug(MODULE_NAME, "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
AaruLogging.Debug(MODULE_NAME, "chainEntry.targetID = {0}", chainEntry.TargetId);
AaruLogging.Debug(MODULE_NAME, "chainEntry.next_ptr = {0}", chainEntry.NextPtr);
AaruLogging.Debug(MODULE_NAME, "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
for(ulong i = 0; i < entries; i++)
{
@@ -417,7 +417,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
chainEntry.BlockPairs[i].GoodBlock = BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + i * 8 + 4));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Bad_block_at_0_replaced_with_good_block_at_1,
chainEntry.BlockPairs[i].BadBlock,
chainEntry.BlockPairs[i].GoodBlock);
@@ -433,7 +433,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
while(nextBlock != 0xFFFFFFFF)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Going_to_block_0_in_search_of_a_PartitionEntry_block,
nextBlock + sectorOffset);
@@ -445,7 +445,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
if(magic != PARTITION_BLOCK_MAGIC) break;
AaruConsole.Debug(MODULE_NAME, Localization.Found_PartitionEntry_block);
AaruLogging.Debug(MODULE_NAME, Localization.Found_PartitionEntry_block);
var partEntry = new PartitionEntry
{
@@ -503,105 +503,105 @@ public sealed class AmigaRigidDiskBlock : IPartition
Array.Copy(sector, 0x24, driveName, 0, 32);
partEntry.DriveName = StringHandlers.PascalToString(driveName, Encoding.GetEncoding("iso-8859-1"));
AaruConsole.Debug(MODULE_NAME, "partEntry.magic = 0x{0:X8}", partEntry.Magic);
AaruLogging.Debug(MODULE_NAME, "partEntry.magic = 0x{0:X8}", partEntry.Magic);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.size = {0} longs, {1} bytes",
partEntry.Size,
partEntry.Size * 4);
AaruConsole.Debug(MODULE_NAME, "partEntry.checksum = 0x{0:X8}", partEntry.Checksum);
AaruConsole.Debug(MODULE_NAME, "partEntry.targetID = {0}", partEntry.TargetId);
AaruConsole.Debug(MODULE_NAME, "partEntry.next_ptr = {0}", partEntry.NextPtr);
AaruConsole.Debug(MODULE_NAME, "partEntry.flags = 0x{0:X8}", partEntry.Flags);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved1 = 0x{0:X8}", partEntry.Reserved1);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved2 = 0x{0:X8}", partEntry.Reserved2);
AaruConsole.Debug(MODULE_NAME, "partEntry.devFlags = 0x{0:X8}", partEntry.DevFlags);
AaruConsole.Debug(MODULE_NAME, "partEntry.driveNameLen = {0}", partEntry.DriveNameLen);
AaruConsole.Debug(MODULE_NAME, "partEntry.driveName = \"{0}\"", partEntry.DriveName);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved3 = 0x{0:X8}", partEntry.Reserved3);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved4 = 0x{0:X8}", partEntry.Reserved4);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved5 = 0x{0:X8}", partEntry.Reserved5);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved6 = 0x{0:X8}", partEntry.Reserved6);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved7 = 0x{0:X8}", partEntry.Reserved7);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved8 = 0x{0:X8}", partEntry.Reserved8);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved9 = 0x{0:X8}", partEntry.Reserved9);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
AaruConsole.Debug(MODULE_NAME, "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
AaruLogging.Debug(MODULE_NAME, "partEntry.checksum = 0x{0:X8}", partEntry.Checksum);
AaruLogging.Debug(MODULE_NAME, "partEntry.targetID = {0}", partEntry.TargetId);
AaruLogging.Debug(MODULE_NAME, "partEntry.next_ptr = {0}", partEntry.NextPtr);
AaruLogging.Debug(MODULE_NAME, "partEntry.flags = 0x{0:X8}", partEntry.Flags);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved1 = 0x{0:X8}", partEntry.Reserved1);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved2 = 0x{0:X8}", partEntry.Reserved2);
AaruLogging.Debug(MODULE_NAME, "partEntry.devFlags = 0x{0:X8}", partEntry.DevFlags);
AaruLogging.Debug(MODULE_NAME, "partEntry.driveNameLen = {0}", partEntry.DriveNameLen);
AaruLogging.Debug(MODULE_NAME, "partEntry.driveName = \"{0}\"", partEntry.DriveName);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved3 = 0x{0:X8}", partEntry.Reserved3);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved4 = 0x{0:X8}", partEntry.Reserved4);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved5 = 0x{0:X8}", partEntry.Reserved5);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved6 = 0x{0:X8}", partEntry.Reserved6);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved7 = 0x{0:X8}", partEntry.Reserved7);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved8 = 0x{0:X8}", partEntry.Reserved8);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved9 = 0x{0:X8}", partEntry.Reserved9);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
AaruLogging.Debug(MODULE_NAME, "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.size = {0} longs, {1} bytes",
partEntry.DosEnvVec.Size,
partEntry.DosEnvVec.Size * 4);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.block_size = {0} longs, {1} bytes",
partEntry.DosEnvVec.BlockSize,
partEntry.DosEnvVec.BlockSize * 4);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.sec_org = 0x{0:X8}",
partEntry.DosEnvVec.SecOrg);
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.surfaces = {0}", partEntry.DosEnvVec.Surfaces);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.surfaces = {0}", partEntry.DosEnvVec.Surfaces);
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.spb = {0}", partEntry.DosEnvVec.Spb);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.spb = {0}", partEntry.DosEnvVec.Spb);
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.bpt = {0}", partEntry.DosEnvVec.Bpt);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.bpt = {0}", partEntry.DosEnvVec.Bpt);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.reservedblocks = {0}",
partEntry.DosEnvVec.Reservedblocks);
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.prealloc = {0}", partEntry.DosEnvVec.Prealloc);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.prealloc = {0}", partEntry.DosEnvVec.Prealloc);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.interleave = {0}",
partEntry.DosEnvVec.Interleave);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.lowCylinder = {0}",
partEntry.DosEnvVec.LowCylinder);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.highCylinder = {0}",
partEntry.DosEnvVec.HighCylinder);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.numBuffer = {0}",
partEntry.DosEnvVec.NumBuffer);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.bufMemType = {0}",
partEntry.DosEnvVec.BufMemType);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.maxTransfer = {0}",
partEntry.DosEnvVec.MaxTransfer);
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.Mask = 0x{0:X8}", partEntry.DosEnvVec.Mask);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.Mask = 0x{0:X8}", partEntry.DosEnvVec.Mask);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.bootPriority = {0}",
partEntry.DosEnvVec.BootPriority);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.dosType = {0}",
AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.baud = {0}", partEntry.DosEnvVec.Baud);
AaruLogging.Debug(MODULE_NAME, "partEntry.dosEnvVec.baud = {0}", partEntry.DosEnvVec.Baud);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.control = 0x{0:X8}",
partEntry.DosEnvVec.Control);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"partEntry.dosEnvVec.bootBlocks = {0}",
partEntry.DosEnvVec.BootBlocks);
@@ -616,7 +616,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
while(nextBlock != 0xFFFFFFFF)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Going_to_block_0_in_search_of_a_FileSystemHeader_block,
nextBlock);
@@ -628,7 +628,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
if(magic != FILESYSTEM_HEADER_MAGIC) break;
AaruConsole.Debug(MODULE_NAME, Localization.Found_FileSystemHeader_block);
AaruLogging.Debug(MODULE_NAME, Localization.Found_FileSystemHeader_block);
var fshd = new FileSystemHeader
{
@@ -657,37 +657,37 @@ public sealed class AmigaRigidDiskBlock : IPartition
}
};
AaruConsole.Debug(MODULE_NAME, "FSHD.magic = 0x{0:X8}", fshd.Magic);
AaruLogging.Debug(MODULE_NAME, "FSHD.magic = 0x{0:X8}", fshd.Magic);
AaruConsole.Debug(MODULE_NAME, "FSHD.size = {0} longs, {1} bytes", fshd.Size, fshd.Size * 4);
AaruLogging.Debug(MODULE_NAME, "FSHD.size = {0} longs, {1} bytes", fshd.Size, fshd.Size * 4);
AaruConsole.Debug(MODULE_NAME, "FSHD.checksum = 0x{0:X8}", fshd.Checksum);
AaruConsole.Debug(MODULE_NAME, "FSHD.targetID = {0}", fshd.TargetId);
AaruConsole.Debug(MODULE_NAME, "FSHD.next_ptr = {0}", fshd.NextPtr);
AaruConsole.Debug(MODULE_NAME, "FSHD.flags = 0x{0:X8}", fshd.Flags);
AaruConsole.Debug(MODULE_NAME, "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
AaruConsole.Debug(MODULE_NAME, "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
AaruLogging.Debug(MODULE_NAME, "FSHD.checksum = 0x{0:X8}", fshd.Checksum);
AaruLogging.Debug(MODULE_NAME, "FSHD.targetID = {0}", fshd.TargetId);
AaruLogging.Debug(MODULE_NAME, "FSHD.next_ptr = {0}", fshd.NextPtr);
AaruLogging.Debug(MODULE_NAME, "FSHD.flags = 0x{0:X8}", fshd.Flags);
AaruLogging.Debug(MODULE_NAME, "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
AaruLogging.Debug(MODULE_NAME, "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
AaruConsole.Debug(MODULE_NAME, "FSHD.dosType = {0}", AmigaDosTypeToString(fshd.DosType));
AaruLogging.Debug(MODULE_NAME, "FSHD.dosType = {0}", AmigaDosTypeToString(fshd.DosType));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"FSHD.version = {0:D2}.{1:D2} (0x{2:X8})",
(fshd.Version & 0xFFFF0000) >> 16,
fshd.Version & 0xFFFF,
fshd.Version);
AaruConsole.Debug(MODULE_NAME, "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
AaruLogging.Debug(MODULE_NAME, "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.type = {0}", fshd.Dnode.Type);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.task = {0}", fshd.Dnode.Task);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.locked = {0}", fshd.Dnode.Locked);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.handler = {0}", fshd.Dnode.Handler);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.stackSize = {0}", fshd.Dnode.StackSize);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.priority = {0}", fshd.Dnode.Priority);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.startup = {0}", fshd.Dnode.Startup);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.type = {0}", fshd.Dnode.Type);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.task = {0}", fshd.Dnode.Task);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.locked = {0}", fshd.Dnode.Locked);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.handler = {0}", fshd.Dnode.Handler);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.stackSize = {0}", fshd.Dnode.StackSize);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.priority = {0}", fshd.Dnode.Priority);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.startup = {0}", fshd.Dnode.Startup);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.global_vec = 0x{0:X8}", fshd.Dnode.GlobalVec);
AaruLogging.Debug(MODULE_NAME, "FSHD.dnode.global_vec = 0x{0:X8}", fshd.Dnode.GlobalVec);
nextBlock = fshd.Dnode.SeglistPtr;
bool thereAreLoadSegments = false;
@@ -695,7 +695,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
while(nextBlock != 0xFFFFFFFF)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Going_to_block_0_in_search_of_a_LoadSegment_block,
nextBlock);
@@ -707,7 +707,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
if(magicSeg != LOAD_SEG_MAGIC) break;
AaruConsole.Debug(MODULE_NAME, Localization.Found_LoadSegment_block);
AaruLogging.Debug(MODULE_NAME, Localization.Found_LoadSegment_block);
thereAreLoadSegments = true;
@@ -723,16 +723,16 @@ public sealed class AmigaRigidDiskBlock : IPartition
loadSeg.LoadData = new byte[(loadSeg.Size - 5) * 4];
Array.Copy(sector, 0x14, loadSeg.LoadData, 0, (loadSeg.Size - 5) * 4);
AaruConsole.Debug(MODULE_NAME, "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
AaruLogging.Debug(MODULE_NAME, "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"loadSeg.size = {0} longs, {1} bytes",
loadSeg.Size,
loadSeg.Size * 4);
AaruConsole.Debug(MODULE_NAME, "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
AaruConsole.Debug(MODULE_NAME, "loadSeg.targetID = {0}", loadSeg.TargetId);
AaruConsole.Debug(MODULE_NAME, "loadSeg.next_ptr = {0}", loadSeg.NextPtr);
AaruLogging.Debug(MODULE_NAME, "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
AaruLogging.Debug(MODULE_NAME, "loadSeg.targetID = {0}", loadSeg.TargetId);
AaruLogging.Debug(MODULE_NAME, "loadSeg.next_ptr = {0}", loadSeg.NextPtr);
segmentEntries.Add(loadSeg);
nextBlock = loadSeg.NextPtr;
@@ -743,7 +743,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
if(thereAreLoadSegments)
{
string loadSegSha1 = sha1Ctx.End();
AaruConsole.Debug(MODULE_NAME, Localization.LoadSegment_data_SHA1_0, loadSegSha1);
AaruLogging.Debug(MODULE_NAME, Localization.LoadSegment_data_SHA1_0, loadSegSha1);
}
fshdEntries.Add(fshd);

58
Aaru.Partitions/SGI.cs
View File

@@ -81,73 +81,73 @@ public sealed class SGI : IPartition
for(int i = 0; i < dvh.partitions.Length; i++)
dvh.partitions[i] = (Partition)Marshal.SwapStructureMembersEndian(dvh.partitions[i]);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.dvh_magic_equals_0_X8_should_be_1_X8,
dvh.magic,
SGI_MAGIC);
if(dvh.magic != SGI_MAGIC) return false;
AaruConsole.Debug(MODULE_NAME, "dvh.root_part_num = {0}", dvh.root_part_num);
AaruConsole.Debug(MODULE_NAME, "dvh.swap_part_num = {0}", dvh.swap_part_num);
AaruLogging.Debug(MODULE_NAME, "dvh.root_part_num = {0}", dvh.root_part_num);
AaruLogging.Debug(MODULE_NAME, "dvh.swap_part_num = {0}", dvh.swap_part_num);
AaruConsole.Debug(MODULE_NAME, "dvh.boot_file = \"{0}\"", StringHandlers.CToString(dvh.boot_file));
AaruLogging.Debug(MODULE_NAME, "dvh.boot_file = \"{0}\"", StringHandlers.CToString(dvh.boot_file));
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dvh.device_params.dp_spares_cyl = {0}",
dvh.device_params.dp_spares_cyl);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_cyls = {0}", dvh.device_params.dp_cyls);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_shd0 = {0}", dvh.device_params.dp_shd0);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_cyls = {0}", dvh.device_params.dp_cyls);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_shd0 = {0}", dvh.device_params.dp_shd0);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_ctq_depth = {0}", dvh.device_params.dp_ctq_depth);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_ctq_depth = {0}", dvh.device_params.dp_ctq_depth);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_cylshi = {0}", dvh.device_params.dp_cylshi);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_cylshi = {0}", dvh.device_params.dp_cylshi);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_secbytes = {0}", dvh.device_params.dp_secbytes);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_secbytes = {0}", dvh.device_params.dp_secbytes);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dvh.device_params.dp_interleave = {0}",
dvh.device_params.dp_interleave);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_datarate = {0}", dvh.device_params.dp_datarate);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_datarate = {0}", dvh.device_params.dp_datarate);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_nretries = {0}", dvh.device_params.dp_nretries);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_nretries = {0}", dvh.device_params.dp_nretries);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_mspw = {0}", dvh.device_params.dp_mspw);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_mspw = {0}", dvh.device_params.dp_mspw);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xrgate = {0}", dvh.device_params.dp_xrgate);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xrgate = {0}", dvh.device_params.dp_xrgate);
AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xwcont = {0}", dvh.device_params.dp_xwcont);
AaruLogging.Debug(MODULE_NAME, "dvh.device_params.dp_xwcont = {0}", dvh.device_params.dp_xwcont);
ulong counter = 0;
for(int i = 0; i < dvh.partitions.Length; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dvh.partitions[{0}].num_blocks = {1}",
i,
dvh.partitions[i].num_blocks);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dvh.partitions[{0}].first_block = {1}",
i,
dvh.partitions[i].first_block);
AaruConsole.Debug(MODULE_NAME, "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
AaruLogging.Debug(MODULE_NAME, "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
var part = new CommonTypes.Partition
{

152
Aaru.Partitions/Sun.cs
View File

@@ -113,9 +113,9 @@ public sealed class SunDisklabel : IPartition
dk_label8 dkl8 = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
dk_label16 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
if(dkl.dkl_magic is DKL_MAGIC or DKL_CIGAM)
{
@@ -161,36 +161,36 @@ public sealed class SunDisklabel : IPartition
{
ulong sectorsPerCylinder = (ulong)(dkl.dkl_nsect * dkl.dkl_nhead);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl.dkl_asciilabel = \"{0}\"",
StringHandlers.CToString(dkl.dkl_asciilabel));
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_rpm = {0}", dkl.dkl_rpm);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_pcyl = {0}", dkl.dkl_pcyl);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_apc = {0}", dkl.dkl_apc);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_gap1 = {0}", dkl.dkl_gap1);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_gap2 = {0}", dkl.dkl_gap2);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_ncyl = {0}", dkl.dkl_ncyl);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_acyl = {0}", dkl.dkl_acyl);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_nhead = {0}", dkl.dkl_nhead);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_nsect = {0}", dkl.dkl_nsect);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_bhead = {0}", dkl.dkl_bhead);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_ppart = {0}", dkl.dkl_ppart);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_rpm = {0}", dkl.dkl_rpm);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_pcyl = {0}", dkl.dkl_pcyl);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_apc = {0}", dkl.dkl_apc);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_gap1 = {0}", dkl.dkl_gap1);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_gap2 = {0}", dkl.dkl_gap2);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_ncyl = {0}", dkl.dkl_ncyl);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_acyl = {0}", dkl.dkl_acyl);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_nhead = {0}", dkl.dkl_nhead);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_nsect = {0}", dkl.dkl_nsect);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_bhead = {0}", dkl.dkl_bhead);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_ppart = {0}", dkl.dkl_ppart);
for(int i = 0; i < NDKMAP; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl.dkl_map[{0}].dkl_cylno = {1}",
i,
dkl.dkl_map[i].dkl_cylno);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_map[{0}].dkl_nblk = {1}", i, dkl.dkl_map[i].dkl_nblk);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_map[{0}].dkl_nblk = {1}", i, dkl.dkl_map[i].dkl_nblk);
}
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
AaruConsole.Debug(MODULE_NAME, "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
AaruConsole.Debug(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
AaruLogging.Debug(MODULE_NAME, "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
AaruLogging.Debug(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
for(int i = 0; i < NDKMAP; i++)
{
@@ -216,66 +216,66 @@ public sealed class SunDisklabel : IPartition
{
ulong sectorsPerCylinder = (ulong)(dkl8.dkl_nsect * dkl8.dkl_nhead);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_asciilabel = \"{0}\"",
StringHandlers.CToString(dkl8.dkl_asciilabel));
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_vtoc.v_volume = \"{0}\"",
StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_nparts = {0}", dkl8.dkl_vtoc.v_nparts);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_write_reinstruct = {0}", dkl8.dkl_write_reinstruct);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_read_reinstruct = {0}", dkl8.dkl_read_reinstruct);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_rpm = {0}", dkl8.dkl_rpm);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_pcyl = {0}", dkl8.dkl_pcyl);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_apc = {0}", dkl8.dkl_apc);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs1 = {0}", dkl8.dkl_obs1);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs2 = {0}", dkl8.dkl_obs2);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_intrlv = {0}", dkl8.dkl_intrlv);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_ncyl = {0}", dkl8.dkl_ncyl);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_acyl = {0}", dkl8.dkl_acyl);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_nhead = {0}", dkl8.dkl_nhead);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_nsect = {0}", dkl8.dkl_nsect);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs3 = {0}", dkl8.dkl_obs3);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs4 = {0}", dkl8.dkl_obs4);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_nparts = {0}", dkl8.dkl_vtoc.v_nparts);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_write_reinstruct = {0}", dkl8.dkl_write_reinstruct);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_read_reinstruct = {0}", dkl8.dkl_read_reinstruct);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_rpm = {0}", dkl8.dkl_rpm);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_pcyl = {0}", dkl8.dkl_pcyl);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_apc = {0}", dkl8.dkl_apc);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_obs1 = {0}", dkl8.dkl_obs1);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_obs2 = {0}", dkl8.dkl_obs2);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_intrlv = {0}", dkl8.dkl_intrlv);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_ncyl = {0}", dkl8.dkl_ncyl);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_acyl = {0}", dkl8.dkl_acyl);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_nhead = {0}", dkl8.dkl_nhead);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_nsect = {0}", dkl8.dkl_nsect);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_obs3 = {0}", dkl8.dkl_obs3);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_obs4 = {0}", dkl8.dkl_obs4);
for(int i = 0; i < NDKMAP; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_map[{0}].dkl_cylno = {1}",
i,
dkl8.dkl_map[i].dkl_cylno);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_map[{0}].dkl_nblk = {1}",
i,
dkl8.dkl_map[i].dkl_nblk);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})",
i,
dkl8.dkl_vtoc.v_part[i].p_tag,
(ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})",
i,
dkl8.dkl_vtoc.v_part[i].p_flag,
(ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl8.dkl_vtoc.v_timestamp[{0}] = {1}",
i,
DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
}
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
AaruConsole.Debug(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
AaruLogging.Debug(MODULE_NAME, "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
AaruLogging.Debug(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
if(dkl8.dkl_vtoc.v_nparts > NDKMAP) return false;
@@ -313,67 +313,67 @@ public sealed class SunDisklabel : IPartition
}
else
{
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_volume = \"{0}\"",
StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_nparts = {0}", dkl16.dkl_vtoc.v_nparts);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_nparts = {0}", dkl16.dkl_vtoc.v_nparts);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_asciilabel = \"{0}\"",
StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_pcyl = {0}", dkl16.dkl_pcyl);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_ncyl = {0}", dkl16.dkl_ncyl);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_acyl = {0}", dkl16.dkl_acyl);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_bcyl = {0}", dkl16.dkl_bcyl);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_nhead = {0}", dkl16.dkl_nhead);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_nsect = {0}", dkl16.dkl_nsect);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_skew = {0}", dkl16.dkl_skew);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_apc = {0}", dkl16.dkl_apc);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_rpm = {0}", dkl16.dkl_rpm);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_pcyl = {0}", dkl16.dkl_pcyl);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_ncyl = {0}", dkl16.dkl_ncyl);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_acyl = {0}", dkl16.dkl_acyl);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_bcyl = {0}", dkl16.dkl_bcyl);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_nhead = {0}", dkl16.dkl_nhead);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_nsect = {0}", dkl16.dkl_nsect);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_skew = {0}", dkl16.dkl_skew);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_apc = {0}", dkl16.dkl_apc);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_rpm = {0}", dkl16.dkl_rpm);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_write_reinstruct = {0}", dkl16.dkl_write_reinstruct);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_write_reinstruct = {0}", dkl16.dkl_write_reinstruct);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
for(int i = 0; i < NDKMAP16; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_part[{0}].p_start = {1}",
i,
dkl16.dkl_vtoc.v_part[i].p_start);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_part[{0}].p_size = {1}",
i,
dkl16.dkl_vtoc.v_part[i].p_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})",
i,
dkl16.dkl_vtoc.v_part[i].p_tag,
(ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})",
i,
dkl16.dkl_vtoc.v_part[i].p_flag,
(ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dkl16.dkl_vtoc.v_timestamp[{0}] = {1}",
i,
DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
}
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
AaruLogging.Debug(MODULE_NAME, "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
if(dkl16.dkl_vtoc.v_nparts > NDKMAP16) return false;
@@ -420,7 +420,7 @@ public sealed class SunDisklabel : IPartition
static dk_label SwapDiskLabel(dk_label label)
{
AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label);
AaruLogging.Debug(MODULE_NAME, Localization.Swapping_dk_label);
label = (dk_label)Marshal.SwapStructureMembersEndian(label);
for(int i = 0; i < label.dkl_map.Length; i++)
@@ -431,7 +431,7 @@ public sealed class SunDisklabel : IPartition
static dk_label8 SwapDiskLabel(dk_label8 label)
{
AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label8);
AaruLogging.Debug(MODULE_NAME, Localization.Swapping_dk_label8);
label = (dk_label8)Marshal.SwapStructureMembersEndian(label);
for(int i = 0; i < label.dkl_map.Length; i++)
@@ -457,7 +457,7 @@ public sealed class SunDisklabel : IPartition
static dk_label16 SwapDiskLabel(dk_label16 label)
{
AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label16);
AaruLogging.Debug(MODULE_NAME, Localization.Swapping_dk_label16);
label = (dk_label16)Marshal.SwapStructureMembersEndian(label);
for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)

138
Aaru.Partitions/VTOC.cs
View File

@@ -91,7 +91,7 @@ public sealed class VTOC : IPartition
magic = BitConverter.ToUInt32(pdsector, 4);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.sanity_at_0_is_1_X8_should_be_2_X8_or_3_X8,
i + sectorOffset,
magic,
@@ -122,49 +122,49 @@ public sealed class VTOC : IPartition
pdold = Marshal.ByteArrayToStructureBigEndian<PDInfoOld>(pdsector);
}
AaruConsole.Debug(MODULE_NAME, "pdinfo.driveid = {0}", pd.driveid);
AaruLogging.Debug(MODULE_NAME, "pdinfo.driveid = {0}", pd.driveid);
AaruConsole.Debug(MODULE_NAME, "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity, PD_MAGIC);
AaruLogging.Debug(MODULE_NAME, "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity, PD_MAGIC);
AaruConsole.Debug(MODULE_NAME, "pdinfo.version = {0}", pd.version);
AaruConsole.Debug(MODULE_NAME, "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
AaruConsole.Debug(MODULE_NAME, "pdinfo.cyls = {0}", pd.cyls);
AaruConsole.Debug(MODULE_NAME, "pdinfo.tracks = {0}", pd.tracks);
AaruConsole.Debug(MODULE_NAME, "pdinfo.sectors = {0}", pd.sectors);
AaruConsole.Debug(MODULE_NAME, "pdinfo.bytes = {0}", pd.bytes);
AaruConsole.Debug(MODULE_NAME, "pdinfo.logicalst = {0}", pd.logicalst);
AaruConsole.Debug(MODULE_NAME, "pdinfo.errlogst = {0}", pd.errlogst);
AaruConsole.Debug(MODULE_NAME, "pdinfo.errlogsz = {0}", pd.errlogsz);
AaruConsole.Debug(MODULE_NAME, "pdinfo.mfgst = {0}", pd.mfgst);
AaruConsole.Debug(MODULE_NAME, "pdinfo.mfgsz = {0}", pd.mfgsz);
AaruConsole.Debug(MODULE_NAME, "pdinfo.defectst = {0}", pd.defectst);
AaruConsole.Debug(MODULE_NAME, "pdinfo.defectsz = {0}", pd.defectsz);
AaruConsole.Debug(MODULE_NAME, "pdinfo.relno = {0}", pd.relno);
AaruConsole.Debug(MODULE_NAME, "pdinfo.relst = {0}", pd.relst);
AaruConsole.Debug(MODULE_NAME, "pdinfo.relsz = {0}", pd.relsz);
AaruConsole.Debug(MODULE_NAME, "pdinfo.relnext = {0}", pd.relnext);
AaruConsole.Debug(MODULE_NAME, "pdinfo.allcstrt = {0}", pdold.allcstrt);
AaruConsole.Debug(MODULE_NAME, "pdinfo.allcend = {0}", pdold.allcend);
AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_ptr = {0}", pd.vtoc_ptr);
AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_len = {0}", pd.vtoc_len);
AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_pad = {0}", pd.vtoc_pad);
AaruConsole.Debug(MODULE_NAME, "pdinfo.alt_ptr = {0}", pd.alt_ptr);
AaruConsole.Debug(MODULE_NAME, "pdinfo.alt_len = {0}", pd.alt_len);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pcyls = {0}", pd.pcyls);
AaruConsole.Debug(MODULE_NAME, "pdinfo.ptracks = {0}", pd.ptracks);
AaruConsole.Debug(MODULE_NAME, "pdinfo.psectors = {0}", pd.psectors);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pbytes = {0}", pd.pbytes);
AaruConsole.Debug(MODULE_NAME, "pdinfo.secovhd = {0}", pd.secovhd);
AaruConsole.Debug(MODULE_NAME, "pdinfo.interleave = {0}", pd.interleave);
AaruConsole.Debug(MODULE_NAME, "pdinfo.skew = {0}", pd.skew);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[0] = {0}", pd.pad[0]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[1] = {0}", pd.pad[1]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[2] = {0}", pd.pad[2]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[3] = {0}", pd.pad[3]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[4] = {0}", pd.pad[4]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[5] = {0}", pd.pad[5]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[6] = {0}", pd.pad[6]);
AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[7] = {0}", pd.pad[7]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.version = {0}", pd.version);
AaruLogging.Debug(MODULE_NAME, "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
AaruLogging.Debug(MODULE_NAME, "pdinfo.cyls = {0}", pd.cyls);
AaruLogging.Debug(MODULE_NAME, "pdinfo.tracks = {0}", pd.tracks);
AaruLogging.Debug(MODULE_NAME, "pdinfo.sectors = {0}", pd.sectors);
AaruLogging.Debug(MODULE_NAME, "pdinfo.bytes = {0}", pd.bytes);
AaruLogging.Debug(MODULE_NAME, "pdinfo.logicalst = {0}", pd.logicalst);
AaruLogging.Debug(MODULE_NAME, "pdinfo.errlogst = {0}", pd.errlogst);
AaruLogging.Debug(MODULE_NAME, "pdinfo.errlogsz = {0}", pd.errlogsz);
AaruLogging.Debug(MODULE_NAME, "pdinfo.mfgst = {0}", pd.mfgst);
AaruLogging.Debug(MODULE_NAME, "pdinfo.mfgsz = {0}", pd.mfgsz);
AaruLogging.Debug(MODULE_NAME, "pdinfo.defectst = {0}", pd.defectst);
AaruLogging.Debug(MODULE_NAME, "pdinfo.defectsz = {0}", pd.defectsz);
AaruLogging.Debug(MODULE_NAME, "pdinfo.relno = {0}", pd.relno);
AaruLogging.Debug(MODULE_NAME, "pdinfo.relst = {0}", pd.relst);
AaruLogging.Debug(MODULE_NAME, "pdinfo.relsz = {0}", pd.relsz);
AaruLogging.Debug(MODULE_NAME, "pdinfo.relnext = {0}", pd.relnext);
AaruLogging.Debug(MODULE_NAME, "pdinfo.allcstrt = {0}", pdold.allcstrt);
AaruLogging.Debug(MODULE_NAME, "pdinfo.allcend = {0}", pdold.allcend);
AaruLogging.Debug(MODULE_NAME, "pdinfo.vtoc_ptr = {0}", pd.vtoc_ptr);
AaruLogging.Debug(MODULE_NAME, "pdinfo.vtoc_len = {0}", pd.vtoc_len);
AaruLogging.Debug(MODULE_NAME, "pdinfo.vtoc_pad = {0}", pd.vtoc_pad);
AaruLogging.Debug(MODULE_NAME, "pdinfo.alt_ptr = {0}", pd.alt_ptr);
AaruLogging.Debug(MODULE_NAME, "pdinfo.alt_len = {0}", pd.alt_len);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pcyls = {0}", pd.pcyls);
AaruLogging.Debug(MODULE_NAME, "pdinfo.ptracks = {0}", pd.ptracks);
AaruLogging.Debug(MODULE_NAME, "pdinfo.psectors = {0}", pd.psectors);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pbytes = {0}", pd.pbytes);
AaruLogging.Debug(MODULE_NAME, "pdinfo.secovhd = {0}", pd.secovhd);
AaruLogging.Debug(MODULE_NAME, "pdinfo.interleave = {0}", pd.interleave);
AaruLogging.Debug(MODULE_NAME, "pdinfo.skew = {0}", pd.skew);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[0] = {0}", pd.pad[0]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[1] = {0}", pd.pad[1]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[2] = {0}", pd.pad[2]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[3] = {0}", pd.pad[3]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[4] = {0}", pd.pad[4]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[5] = {0}", pd.pad[5]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[6] = {0}", pd.pad[6]);
AaruLogging.Debug(MODULE_NAME, "pdinfo.pad[7] = {0}", pd.pad[7]);
magicFound = false;
bool useOld = false;
@@ -179,7 +179,7 @@ public sealed class VTOC : IPartition
if(magic is VTOC_SANE or VTOC_ENAS)
{
magicFound = true;
AaruConsole.Debug(MODULE_NAME, Localization.New_VTOC_found_at_0, pdloc + sectorOffset + 1);
AaruLogging.Debug(MODULE_NAME, Localization.New_VTOC_found_at_0, pdloc + sectorOffset + 1);
if(magic == VTOC_SANE)
vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
@@ -206,7 +206,7 @@ public sealed class VTOC : IPartition
{
magicFound = true;
useOld = true;
AaruConsole.Debug(MODULE_NAME, Localization.Old_VTOC_found_at_0, pdloc + sectorOffset + 1);
AaruLogging.Debug(MODULE_NAME, Localization.Old_VTOC_found_at_0, pdloc + sectorOffset + 1);
if(magic == VTOC_SANE)
vtocOld = Marshal.ByteArrayToStructureLittleEndian<VTocOld>(vtocsector);
@@ -228,14 +228,14 @@ public sealed class VTOC : IPartition
if(!magicFound)
{
AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_VTOC_on_relative_byte_0, pd.vtoc_ptr);
AaruLogging.Debug(MODULE_NAME, Localization.Searching_for_VTOC_on_relative_byte_0, pd.vtoc_ptr);
ulong relSecPtr = pd.vtoc_ptr / imagePlugin.Info.SectorSize;
uint relSecOff = pd.vtoc_ptr % imagePlugin.Info.SectorSize;
uint secCount = (relSecOff + pd.vtoc_len) / imagePlugin.Info.SectorSize;
if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0) secCount++;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Going_to_read_0_sectors_from_sector_1_getting_VTOC_from_byte_2,
secCount,
relSecPtr + sectorOffset,
@@ -243,7 +243,7 @@ public sealed class VTOC : IPartition
if(relSecPtr + sectorOffset + secCount >= imagePlugin.Info.Sectors)
{
AaruConsole.Debug(MODULE_NAME, Localization.Going_to_read_past_device_size_aborting);
AaruLogging.Debug(MODULE_NAME, Localization.Going_to_read_past_device_size_aborting);
return false;
}
@@ -259,7 +259,7 @@ public sealed class VTOC : IPartition
if(magic is VTOC_SANE or VTOC_ENAS)
{
magicFound = true;
AaruConsole.Debug(MODULE_NAME, Localization.New_VTOC_found);
AaruLogging.Debug(MODULE_NAME, Localization.New_VTOC_found);
if(magic == VTOC_SANE)
vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
@@ -281,52 +281,52 @@ public sealed class VTOC : IPartition
if(!magicFound)
{
AaruConsole.Debug(MODULE_NAME, Localization.Cannot_find_VTOC);
AaruLogging.Debug(MODULE_NAME, Localization.Cannot_find_VTOC);
return false;
}
if(useOld)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
vtocOld.v_sanity,
VTOC_SANE);
AaruConsole.Debug(MODULE_NAME, "vtocOld.v_version = {0}", vtocOld.v_version);
AaruLogging.Debug(MODULE_NAME, "vtocOld.v_version = {0}", vtocOld.v_version);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_volume = \"{0}\"",
StringHandlers.CToString(vtocOld.v_volume));
AaruConsole.Debug(MODULE_NAME, "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
AaruConsole.Debug(MODULE_NAME, "vtocOld.v_nparts = {0}", vtocOld.v_nparts);
AaruLogging.Debug(MODULE_NAME, "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
AaruLogging.Debug(MODULE_NAME, "vtocOld.v_nparts = {0}", vtocOld.v_nparts);
for(int i = 0; i < V_NUMPAR; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_part[{0}].p_tag = {1} ({2})",
i,
vtocOld.v_part[i].p_tag,
(ushort)vtocOld.v_part[i].p_tag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_part[{0}].p_flag = {1} ({2})",
i,
vtocOld.v_part[i].p_flag,
(ushort)vtocOld.v_part[i].p_flag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_part[{0}].p_start = {1}",
i,
vtocOld.v_part[i].p_start);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.v_part[{0}].p_size = {1}",
i,
vtocOld.v_part[i].p_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtocOld.timestamp[{0}] = {1}",
i,
DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
@@ -334,37 +334,37 @@ public sealed class VTOC : IPartition
}
else
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
vtoc.v_sanity,
VTOC_SANE);
AaruConsole.Debug(MODULE_NAME, "vtoc.v_version = {0}", vtoc.v_version);
AaruLogging.Debug(MODULE_NAME, "vtoc.v_version = {0}", vtoc.v_version);
AaruConsole.Debug(MODULE_NAME, "vtoc.v_volume = \"{0}\"", StringHandlers.CToString(vtoc.v_volume));
AaruLogging.Debug(MODULE_NAME, "vtoc.v_volume = \"{0}\"", StringHandlers.CToString(vtoc.v_volume));
AaruConsole.Debug(MODULE_NAME, "vtoc.v_pad = {0}", vtoc.v_pad);
AaruConsole.Debug(MODULE_NAME, "vtoc.v_nparts = {0}", vtoc.v_nparts);
AaruLogging.Debug(MODULE_NAME, "vtoc.v_pad = {0}", vtoc.v_pad);
AaruLogging.Debug(MODULE_NAME, "vtoc.v_nparts = {0}", vtoc.v_nparts);
for(int i = 0; i < V_NUMPAR; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtoc.v_part[{0}].p_tag = {1} ({2})",
i,
vtoc.v_part[i].p_tag,
(ushort)vtoc.v_part[i].p_tag);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtoc.v_part[{0}].p_flag = {1} ({2})",
i,
vtoc.v_part[i].p_flag,
(ushort)vtoc.v_part[i].p_flag);
AaruConsole.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_start = {1}", i, vtoc.v_part[i].p_start);
AaruLogging.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_start = {1}", i, vtoc.v_part[i].p_start);
AaruConsole.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_size = {1}", i, vtoc.v_part[i].p_size);
AaruLogging.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_size = {1}", i, vtoc.v_part[i].p_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"vtoc.timestamp[{0}] = {1}",
i,
DateHandlers.UnixToDateTime(vtoc.timestamp[i]));

6
Aaru.Partitions/XENIX.cs
View File

@@ -77,7 +77,7 @@ public sealed class XENIX : IPartition
Partable xnxtbl = Marshal.ByteArrayToStructureLittleEndian<Partable>(tblsector);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"xnxtbl.p_magic = 0x{0:X4} (should be 0x{1:X4})",
xnxtbl.p_magic,
PAMAGIC);
@@ -86,8 +86,8 @@ public sealed class XENIX : IPartition
for(int i = 0; i < MAXPARTS; i++)
{
AaruConsole.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_off = {1}", i, xnxtbl.p[i].p_off);
AaruConsole.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
AaruLogging.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_off = {1}", i, xnxtbl.p[i].p_off);
AaruLogging.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
if(xnxtbl.p[i].p_size <= 0) continue;