From 5402449439828a20e4b2b3ba8035694eab5f9ad5 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Thu, 5 Sep 2019 22:43:09 +1000 Subject: [PATCH] tidying --- src/com/bytezone/diskbrowser/nib/DiskReader.java | 10 +++++++++- .../bytezone/diskbrowser/nib/DiskReader16Sector.java | 8 -------- src/com/bytezone/diskbrowser/nib/WozFile.java | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/com/bytezone/diskbrowser/nib/DiskReader.java b/src/com/bytezone/diskbrowser/nib/DiskReader.java index 9c02f9c..16ead27 100644 --- a/src/com/bytezone/diskbrowser/nib/DiskReader.java +++ b/src/com/bytezone/diskbrowser/nib/DiskReader.java @@ -54,11 +54,19 @@ abstract class DiskReader return decodeSector (buffer, 0); } + // reverse 2 bits - 0 <= bits <= 3 // ---------------------------------------------------------------------------------// - // abstract functions + static int reverse (int bits) // ---------------------------------------------------------------------------------// + { + return bits == 1 ? 2 : bits == 2 ? 1 : bits; + } + // ---------------------------------------------------------------------------------// abstract byte[] decodeSector (byte[] buffer, int offset) throws DiskNibbleException; + // ---------------------------------------------------------------------------------// + // ---------------------------------------------------------------------------------// abstract byte[] encodeSector (byte[] buffer); + // ---------------------------------------------------------------------------------// } diff --git a/src/com/bytezone/diskbrowser/nib/DiskReader16Sector.java b/src/com/bytezone/diskbrowser/nib/DiskReader16Sector.java index ac93080..b357421 100644 --- a/src/com/bytezone/diskbrowser/nib/DiskReader16Sector.java +++ b/src/com/bytezone/diskbrowser/nib/DiskReader16Sector.java @@ -103,12 +103,4 @@ class DiskReader16Sector extends DiskReader return encodedBuffer; } - - // reverse 2 bits - 0 <= bits <= 3 - // ---------------------------------------------------------------------------------// - private static int reverse (int bits) - // ---------------------------------------------------------------------------------// - { - return bits == 1 ? 2 : bits == 2 ? 1 : bits; - } } diff --git a/src/com/bytezone/diskbrowser/nib/WozFile.java b/src/com/bytezone/diskbrowser/nib/WozFile.java index 90b58c8..de7d189 100644 --- a/src/com/bytezone/diskbrowser/nib/WozFile.java +++ b/src/com/bytezone/diskbrowser/nib/WozFile.java @@ -113,13 +113,13 @@ public class WozFile sectors.addAll (track.sectors); Collections.sort (sectors); - diskBuffer = new byte[800 * info.sides * SECTOR_SIZE * 2]; + diskBuffer = new byte[800 * info.sides * BLOCK_SIZE]; ptr = 0; for (Sector sector : sectors) { - sector.pack (diskBuffer, ptr); - ptr += 512; + sector.pack35 (diskBuffer, ptr); + ptr += BLOCK_SIZE; } } } @@ -646,7 +646,7 @@ public class WozFile } // ---------------------------------------------------------------------------------// - void pack (byte[] diskBuffer, int ptr) throws DiskNibbleException + void pack35 (byte[] diskBuffer, int ptr) throws DiskNibbleException // ---------------------------------------------------------------------------------// { DiskReader diskReader = DiskReader.getInstance (0); @@ -656,7 +656,7 @@ public class WozFile byte[] decodedBuffer = diskReader.decodeSector (track.newBuffer, dataOffset + 4); // return 512 bytes (ignore the 12 tag bytes) - System.arraycopy (decodedBuffer, 12, diskBuffer, ptr, 512); + System.arraycopy (decodedBuffer, DiskReaderGCR.TAG_SIZE, diskBuffer, ptr, 512); } // ---------------------------------------------------------------------------------//