aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛Correct ProDOS filesystem detection on Apple II disks.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-05 23:58:03 +00:00
parent ba9cd760fa
commit 4b359e71f8
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DiscImageChef.Filesystems/ProDOS.cs
View File

@@ -92,8 +92,10 @@ namespace DiscImageChef.Filesystems
{ {
if(partition.Length < 3) return false; if(partition.Length < 3) return false;
uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
// Blocks 0 and 1 are boot code // Blocks 0 and 1 are boot code
byte[] rootDirectoryKeyBlock = imagePlugin.ReadSector(2 + partition.Start); byte[] rootDirectoryKeyBlock = imagePlugin.ReadSectors(2 * multiplier + partition.Start, multiplier);
bool APMFromHDDOnCD = false; bool APMFromHDDOnCD = false;
if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448 || if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448 ||
@@ -155,9 +157,10 @@ namespace DiscImageChef.Filesystems
{ {
Encoding = encoding ?? new Apple2c(); Encoding = encoding ?? new Apple2c();
StringBuilder sbInformation = new StringBuilder(); StringBuilder sbInformation = new StringBuilder();
uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
// Blocks 0 and 1 are boot code // Blocks 0 and 1 are boot code
byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSector(2 + partition.Start); byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSectors(2 * multiplier + partition.Start, multiplier);
bool APMFromHDDOnCD = false; bool APMFromHDDOnCD = false;
@@ -187,11 +190,13 @@ namespace DiscImageChef.Filesystems
} }
} }
ProDOSRootDirectoryKeyBlock rootDirectoryKeyBlock = ProDOSRootDirectoryKeyBlock rootDirectoryKeyBlock = new ProDOSRootDirectoryKeyBlock
new ProDOSRootDirectoryKeyBlock {header = new ProDOSRootDirectoryHeader()}; {
header = new ProDOSRootDirectoryHeader(),
zero = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x00),
next_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x02)
};
rootDirectoryKeyBlock.zero = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x00);
rootDirectoryKeyBlock.next_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x02);
rootDirectoryKeyBlock.header.storage_type = rootDirectoryKeyBlock.header.storage_type =
(byte)((rootDirectoryKeyBlockBytes[0x04] & STORAGE_TYPE_MASK) >> (byte)((rootDirectoryKeyBlockBytes[0x04] & STORAGE_TYPE_MASK) >>
4); 4);