Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2025-03-01 17:29:23 +00:00
Code Issues Projects Releases Wiki Activity

fixed isValidCatalogSector() check

Browse Source
This commit is contained in:
Denis Molony 2020-04-10 10:47:42 +10:00
parent 0a01db617f
commit e1811f8fbe
2 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/bytezone/diskbrowser/dos/CatalogEntry.java
View File

@ -148,7 +148,9 @@ class CatalogEntry extends AbstractCatalogEntry
if (!da.getDisk ().isValidAddress (buffer[1], buffer[2])) if (!da.getDisk ().isValidAddress (buffer[1], buffer[2]))
return false; return false;
if (buffer[4] != 0) if (buffer[3] != 0 || buffer[4] != 0) // not supposed to be used
// Diags2E.dsk stores its own sector address here
if (da.getTrack () != (buffer[3] & 0xFF) && da.getSector () != (buffer[4] & 0xFF))
return false; return false;
return true; return true;

47
src/com/bytezone/diskbrowser/dos/DosDisk.java
View File

@ -269,49 +269,34 @@ public class DosDisk extends AbstractFormattedDisk
public static boolean isCorrectFormat (AppleDisk disk) public static boolean isCorrectFormat (AppleDisk disk)
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
{ {
if (debug) if (false)
System.out.println ("Checking interleave 0"); {
disk.setInterleave (0); disk.setInterleave (2);
int catalogBlocks0 = checkFormat (disk);
if (catalogBlocks0 > 3)
return true; return true;
}
if (disk.getSectorsPerTrack () > 16) if (disk.getSectorsPerTrack () > 16)
return false; return false;
if (debug) int[] cb = new int[3];
System.out.println ("Checking interleave 1"); for (int interleave = 0; interleave < 3; interleave++)
disk.setInterleave (1);
int catalogBlocks1 = checkFormat (disk);
if (catalogBlocks1 > 3)
return true;
if (debug)
System.out.println ("Checking interleave 2");
disk.setInterleave (2);
int catalogBlocks2 = checkFormat (disk);
if (catalogBlocks2 > 3)
return true;
if (catalogBlocks0 > 0)
{ {
disk.setInterleave (0); if (debug)
System.out.printf ("Checking interleave %d%n", interleave);
disk.setInterleave (interleave);
cb[interleave] = checkFormat (disk);
if (cb[interleave] > 3)
return true; return true;
} }
if (catalogBlocks1 > 0) for (int max = 2; max > 0; max--)
for (int interleave = 0; interleave < 3; interleave++)
{ {
disk.setInterleave (1); if (cb[interleave] >= max)
{
disk.setInterleave (interleave);
return true; return true;
} }
if (catalogBlocks2 > 0)
{
disk.setInterleave (2);
return true;
} }
return false; return false;