Apple-2-Tools
/
AppleCommander
mirror of https://github.com/AppleCommander/AppleCommander.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing acx create disk with DOS format to mark tracks 0-2 as used. #129

This commit is contained in:
Rob Greene 2023-10-26 23:01:25 -05:00
parent d62eee955c
commit 72f51be107
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cli-acx/src/main/java/io/github/applecommander/acx/SystemType.java
View File

@ -98,8 +98,7 @@ public enum SystemType {
static void copyDosSystemTracks(FormattedDisk targetDisk, FormattedDisk source) { static void copyDosSystemTracks(FormattedDisk targetDisk, FormattedDisk source) {
DosFormatDisk target = (DosFormatDisk)targetDisk; DosFormatDisk target = (DosFormatDisk)targetDisk;
// FIXME messing with the VTOC should be handled elsewhere byte[] vtoc = target.readVtoc();
byte[] vtoc = source.readSector(DosFormatDisk.CATALOG_TRACK, DosFormatDisk.VTOC_SECTOR);
int sectorsPerTrack = vtoc[0x35]; int sectorsPerTrack = vtoc[0x35];
// Note that this also patches T0 S0 for BOOT0 // Note that this also patches T0 S0 for BOOT0
for (int t=0; t<3; t++) { for (int t=0; t<3; t++) {
@ -108,6 +107,7 @@ public enum SystemType {
target.setSectorUsed(t, s, vtoc); target.setSectorUsed(t, s, vtoc);
} }
} }
target.writeVtoc(vtoc);
} }
static void copyProdosSystemFiles(FormattedDisk target, FormattedDisk source) { static void copyProdosSystemFiles(FormattedDisk target, FormattedDisk source) {
// We need to explicitly fix the boot block // We need to explicitly fix the boot block

4
lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java
View File

@ -275,14 +275,14 @@ public class DosFormatDisk extends FormattedDisk {
/** /**
* Return the VTOC (Volume Table Of Contents). * Return the VTOC (Volume Table Of Contents).
*/ */
protected byte[] readVtoc() { public byte[] readVtoc() {
return readSector(CATALOG_TRACK, VTOC_SECTOR); return readSector(CATALOG_TRACK, VTOC_SECTOR);
} }
/** /**
* Save the VTOC (Volume Table Of Contents) to disk. * Save the VTOC (Volume Table Of Contents) to disk.
*/ */
protected void writeVtoc(byte[] vtoc) { public void writeVtoc(byte[] vtoc) {
writeSector(CATALOG_TRACK, VTOC_SECTOR, vtoc); writeSector(CATALOG_TRACK, VTOC_SECTOR, vtoc);
} }