make .v2d match .woz

This commit is contained in:
Denis Molony
2018-06-10 09:18:06 +10:00
parent b67fa57e6b
commit 65791d994e
2 changed files with 11 additions and 8 deletions

View File

@@ -203,15 +203,15 @@ public class AppleDisk implements Disk
checkSectorsForData ();
}
public AppleDisk (V2dDisk disk)
public AppleDisk (V2dDisk disk, int tracks, int sectors)
{
tracks = 35;
trackSize = 4096;
this.tracks = tracks;
this.sectors = sectors;
file = disk.file;
diskBuffer = disk.diskBuffer;
sectorSize = 256;
sectors = 16;
trackSize = 4096;
sectorSize = trackSize / sectors;
blocks = tracks * sectors;
hasData = new boolean[blocks];

View File

@@ -231,16 +231,19 @@ public class DiskFactory
{
if (debug)
System.out.println (" ** v2d **");
V2dDisk v2dDisk = new V2dDisk (file);
AppleDisk appleDisk16 = new AppleDisk (v2dDisk);
disk = checkDos (appleDisk16);
disk = checkDos (new AppleDisk (v2dDisk, 35, 16));
if (disk == null)
disk = checkProdos (new AppleDisk (v2dDisk, 35, 8));
return disk;
}
if (suffix.equals ("nib"))
if (suffix.equals ("nib")) // not implemented yet
{
if (debug)
System.out.println (" ** nib **");
NibDisk nibDisk = new NibDisk (file);
AppleDisk appleDisk16 = new AppleDisk (nibDisk);
disk = checkDos (appleDisk16);