Apple-2-Tools/AppleCommander
1
0
Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2026-04-26 11:25:32 +00:00
Code Issues Projects Releases Wiki Activity

Trying to loosen up nibble recognition a bit.

Browse Source
This commit is contained in:
Rob Greene
2025-09-04 22:23:01 -05:00
parent 9c223a97b1
commit 02dd465630
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ac-api/src/main/java/org/applecommander/device/TrackSectorNibbleDevice.java
+29 -24
View File
@@ -57,38 +57,43 @@ public class TrackSectorNibbleDevice implements TrackSectorDevice {
* it appears Ultima I may have used it. :-)
*/
public static Optional<TrackSectorDevice> identify(NibbleTrackReaderWriter trackReaderWriter) {
try {
// Try 16-sector disks first:
final int sectorsPerTrack = 16;
TrackSectorDevice device = new TrackSectorNibbleDevice(trackReaderWriter,
DiskMarker.disk525sector16(), new Nibble62Disk525Codec(), sectorsPerTrack);
for (int sector = 0; sector < sectorsPerTrack; sector++) {
// Try 16-sector disks first:
int sectorsPerTrack = 16;
TrackSectorDevice device = new TrackSectorNibbleDevice(trackReaderWriter,
DiskMarker.disk525sector16(), new Nibble62Disk525Codec(), sectorsPerTrack);
int count = 0;
for (int sector = 0; sector < sectorsPerTrack; sector++) {
try {
DataBuffer sectorData = device.readSector(0, sector);
if (sectorData.limit() != TrackSectorDevice.SECTOR_SIZE) {
return Optional.empty();
if (sectorData.limit() == TrackSectorDevice.SECTOR_SIZE) {
count++;
}
} catch (Throwable t) {
// ignored
}
return Optional.of(device);
} catch (Throwable t) {
// ignored
}
try {
// Next try 13-sector disks:
final int sectorsPerTrack = 13;
TrackSectorDevice device = new TrackSectorNibbleDevice(trackReaderWriter,
DiskMarker.disk525sector13(), new Nibble53Disk525Codec(), sectorsPerTrack);
for (int sector = 0; sector < sectorsPerTrack; sector++) {
if (count > 0) {
// Just making certain we read more than sector 0
return (count > 1) ? Optional.of(device) : Optional.empty();
}
// Next try 13-sector disks:
sectorsPerTrack = 13;
device = new TrackSectorNibbleDevice(trackReaderWriter,
DiskMarker.disk525sector13(), new Nibble53Disk525Codec(), sectorsPerTrack);
count = 0;
for (int sector = 0; sector < sectorsPerTrack; sector++) {
try {
DataBuffer sectorData = device.readSector(0, sector);
if (sectorData.limit() != TrackSectorDevice.SECTOR_SIZE) {
return Optional.empty();
if (sectorData.limit() == TrackSectorDevice.SECTOR_SIZE) {
count++;
}
} catch (Throwable t) {
// ignored
}
return Optional.of(device);
} catch (Throwable t) {
// ignored
}
// Failure
return Optional.empty();
// Just making certain we read more than sector 0
return (count > 1) ? Optional.of(device) : Optional.empty();
}
/**