Apple-2-Tools/AppleCommander
1
0
Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2024-12-22 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Added support for OzDOS and added a minor hack to getOffset to

Browse Source 
allow track 0 sector 0 to always be referenced (even if the disk appears
to be too big).
This commit is contained in:
Robert Greene 2002-12-17 05:24:19 +00:00
parent fb97d2c68e
commit 1479d0fee8
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/com/webcodepro/applecommander/storage/Disk.java
View File

@ -167,6 +167,12 @@ public class Disk {
UniDosFormatDisk.UNIDOS_DISK_1), UniDosFormatDisk.UNIDOS_DISK_1),
new UniDosFormatDisk(filename, diskImage, new UniDosFormatDisk(filename, diskImage,
UniDosFormatDisk.UNIDOS_DISK_2) }; UniDosFormatDisk.UNIDOS_DISK_2) };
} else if (isOzDosFormat()) {
return new FormattedDisk[] {
new OzDosFormatDisk(filename, diskImage,
OzDosFormatDisk.OZDOS_DISK_1),
new OzDosFormatDisk(filename, diskImage,
OzDosFormatDisk.OZDOS_DISK_2) };
} else if (isDosFormat()) { } else if (isDosFormat()) {
return new FormattedDisk[] return new FormattedDisk[]
{ new DosFormatDisk(filename, diskImage) }; { new DosFormatDisk(filename, diskImage) };
@ -359,7 +365,9 @@ public class Disk {
*/ */
protected int getOffset(int track, int sector) throws IllegalArgumentException { protected int getOffset(int track, int sector) throws IllegalArgumentException {
int length = diskImage.length; int length = diskImage.length;
if (length != APPLE_140KB_DISK && length != APPLE_800KB_DISK) { if (length != APPLE_140KB_DISK && length != APPLE_800KB_DISK
&& length != APPLE_800KB_2IMG_DISK
&& track != 0 && sector != 0) { // HACK: Allows boot sector writing
throw new IllegalArgumentException("Unrecognized DOS format!"); throw new IllegalArgumentException("Unrecognized DOS format!");
} }
int sectorsPerTrack = 16; int sectorsPerTrack = 16;
@ -414,6 +422,8 @@ public class Disk {
/** /**
* Test the disk format to see if this is a UniDOS formatted * Test the disk format to see if this is a UniDOS formatted
* disk. UniDOS creates two logical disks on an 800KB physical disk. * disk. UniDOS creates two logical disks on an 800KB physical disk.
* The first logical disk takes up the first 400KB and the second
* logical disk takes up the second 400KB.
*/ */
public boolean isUniDosFormat() { public boolean isUniDosFormat() {
if (getPhysicalSize() != APPLE_800KB_DISK if (getPhysicalSize() != APPLE_800KB_DISK
@ -430,6 +440,7 @@ public class Disk {
&& vtoc1[0x34] == 50 // expect 50 tracks per disk && vtoc1[0x34] == 50 // expect 50 tracks per disk
&& vtoc1[0x35] == 32 // expect 32 sectors per disk && vtoc1[0x35] == 32 // expect 32 sectors per disk
&& vtoc1[0x36] == 0 // bytes per sector (low byte) && vtoc1[0x36] == 0 // bytes per sector (low byte)
&& vtoc1[0x37] == 1 // bytes per sector (high byte)
// LOGICAL DISK #2 // LOGICAL DISK #2
&& vtoc2[0x37] == 1 // bytes per sector (high byte) && vtoc2[0x37] == 1 // bytes per sector (high byte)
&& vtoc2[0x01] == 17 // expect catalog to start on track 17 && vtoc2[0x01] == 17 // expect catalog to start on track 17
@ -441,6 +452,38 @@ public class Disk {
&& vtoc2[0x37] == 1; // bytes per sector (high byte) && vtoc2[0x37] == 1; // bytes per sector (high byte)
} }
/**
* Test the disk format to see if this is a OzDOS formatted
* disk. OzDOS creates two logical disks on an 800KB physical disk.
* The first logical disk takes the first half of each block and
* the second logical disk takes the second half of each block.
*/
public boolean isOzDosFormat() {
if (getPhysicalSize() != APPLE_800KB_DISK
&& getPhysicalSize() != APPLE_800KB_2IMG_DISK) {
return false;
}
byte[] vtoc = readBlock(544); // contains BOTH VTOCs!
return
// LOGICAL DISK #1
vtoc[0x001] == 17 // expect catalog to start on track 17
&& vtoc[0x002] == 31 // expect catalog to start on sector 31
&& vtoc[0x027] == 122 // expect 122 tract/sector pairs per sector
&& vtoc[0x034] == 50 // expect 50 tracks per disk
&& vtoc[0x035] == 32 // expect 32 sectors per disk
&& vtoc[0x036] == 0 // bytes per sector (low byte)
&& vtoc[0x037] == 1 // bytes per sector (high byte)
// LOGICAL DISK #2
&& vtoc[0x137] == 1 // bytes per sector (high byte)
&& vtoc[0x101] == 17 // expect catalog to start on track 17
&& vtoc[0x102] == 31 // expect catalog to start on sector 31
&& vtoc[0x127] == 122 // expect 122 tract/sector pairs per sector
&& vtoc[0x134] == 50 // expect 50 tracks per disk
&& vtoc[0x135] == 32 // expect 32 sectors per disk
&& vtoc[0x136] == 0 // bytes per sector (low byte)
&& vtoc[0x137] == 1; // bytes per sector (high byte)
}
/** /**
* Test the disk format to see if this is a Pascal formatted * Test the disk format to see if this is a Pascal formatted
* disk. * disk.