Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-12-25 14:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Tidying

Browse Source
This commit is contained in:
Denis Molony 2016-11-28 21:43:50 +11:00
parent e0e7fae9ce
commit d1ceac22ac
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/bytezone/diskbrowser/disk/V2dDisk.java
View File

@ -10,6 +10,7 @@ import com.bytezone.diskbrowser.disk.Nibblizer.DataField;
import com.bytezone.diskbrowser.utilities.HexFormatter; import com.bytezone.diskbrowser.utilities.HexFormatter;
/* /*
* from Gerard Putter's email:
* Offsets in bytes * Offsets in bytes
* From To Meaning * From To Meaning
* 0000 0003 Length of disk image, from offset 8 to the end (big endian) * 0000 0003 Length of disk image, from offset 8 to the end (big endian)
@ -30,13 +31,9 @@ import com.bytezone.diskbrowser.utilities.HexFormatter;
// Block ..: 0 1 2 3 4 5 6 7 8 9 A B C D E F // Block ..: 0 1 2 3 4 5 6 7 8 9 A B C D E F
// Position: 0 8 1 9 2 A 3 B 4 C 5 D 6 E 7 F - Prodos (.PO disks) // Position: 0 8 1 9 2 A 3 B 4 C 5 D 6 E 7 F - Prodos (.PO disks)
// Position: 0 7 E 6 D 5 C 4 B 3 A 2 9 1 8 F - Dos (.DO disks) // Position: 0 7 E 6 D 5 C 4 B 3 A 2 9 1 8 F - Dos (.DO disks)
public class V2dDisk public class V2dDisk
{ {
private static byte[] addressPrologue = { (byte) 0xD5, (byte) 0xAA, (byte) 0x96 };
private static byte[] dataPrologue = { (byte) 0xD5, (byte) 0xAA, (byte) 0xAD };
private static byte[] epilogue = { (byte) 0xDE, (byte) 0xAA, (byte) 0xEB };
// this assumes dos order
private static int[][] interleave = private static int[][] interleave =
{ { 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15 }, { { 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15 },
{ 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15 } }; { 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15 } };
@ -62,11 +59,10 @@ public class V2dDisk
in.read (diskBuffer); in.read (diskBuffer);
int diskLength = HexFormatter.getLongBigEndian (diskBuffer, 0); // 4 bytes int diskLength = HexFormatter.getLongBigEndian (diskBuffer, 0); // 4 bytes
// System.out.printf ("Disk length: %,d%n", diskLength);
String id = HexFormatter.getString (diskBuffer, 4, 4); // 4 bytes String id = HexFormatter.getString (diskBuffer, 4, 4); // 4 bytes
// System.out.printf ("ID: %s%n", id);
tracks = HexFormatter.getShortBigEndian (diskBuffer, 8); // 2 bytes tracks = HexFormatter.getShortBigEndian (diskBuffer, 8); // 2 bytes
// System.out.printf ("Tracks: %d%n", tracks);
assert "D5NI".equals (id);
for (int i = 0; i < tracks; i++) for (int i = 0; i < tracks; i++)
{ {
@ -77,11 +73,13 @@ public class V2dDisk
int fullTrackNo = trackNumber / 4; int fullTrackNo = trackNumber / 4;
int halfTrackNo = trackNumber % 4; int halfTrackNo = trackNumber % 4;
// System.out.printf ("%3d %3d%n", fullTrackNo, halfTrackNo);
byte[] trackData = new byte[trackLength]; byte[] trackData = new byte[trackLength];
in.read (trackData); in.read (trackData);
if (processTrack (trackData, buffer)) // only process full tracks
if (halfTrackNo == 0 && processTrack (fullTrackNo, trackData, buffer))
actualTracks++; actualTracks++;
} }
@ -90,19 +88,18 @@ public class V2dDisk
catch (IOException e) catch (IOException e)
{ {
e.printStackTrace (); e.printStackTrace ();
System.exit (1);
} }
this.tracks = tracks; this.tracks = tracks;
} }
private boolean processTrack (byte[] buffer, byte[] diskBuffer) private boolean processTrack (int trackNo, byte[] buffer, byte[] diskBuffer)
{ {
int ptr = 0; int ptr = 0;
while (buffer[ptr] == (byte) 0xEB) while (buffer[ptr] == (byte) 0xEB)
{ {
System.out.println ("overrun: " + ptr); System.out.println ("overrun: " + ptr + " in track " + trackNo);
++ptr; ++ptr;
} }