Work on FloppyDrive TrackDevice interface

Author: dirkwhoffmann

Core/Components/Paula/DiskController/DiskController.cpp

@@ -283,7 +283,7 @@ DiskController::readByte()
     FloppyDrive *drive = getSelectedDrive();
 
     // Read a byte from the drive
-    incoming = drive ? drive->readByteAndRotate() : 0;
+    incoming = drive ? drive->read8AndRotate() : 0;
 
     // Set the byte ready flag (shows up in DSKBYT)
     incoming |= 0x8000;
@@ -343,7 +343,7 @@ DiskController::writeByte()
         u8 outgoing = readFifo();
 
         // Write byte to disk
-        if (drive) drive->writeByteAndRotate(outgoing);
+        if (drive) drive->write8AndRotate(outgoing);
     }
 }
 
@@ -466,7 +466,7 @@ DiskController::performDMAWrite(FloppyDrive *drive, u32 remaining)
             while (!fifoIsEmpty()) {
 
                 u8 value = readFifo();
-                if (drive) drive->writeByteAndRotate(value);
+                if (drive) drive->write8AndRotate(value);
             }
             setState(DriveDmaState::OFF);
 
@@ -529,7 +529,7 @@ DiskController::performTurboRead(FloppyDrive *drive)
     for (isize i = 0; i < (dsklen & 0x3FFF); i++) {
 
         // Read word from disk
-        u16 word = drive->readWordAndRotate();
+        u16 word = drive->read16AndRotate();
 
         // Write word into memory
         if (DSK_CHECKSUM) {
@@ -570,7 +570,7 @@ DiskController::performTurboWrite(FloppyDrive *drive)
         agnus.dskpt += 2;
 
         // Write word to disk
-        drive->writeWordAndRotate(word);
+        drive->write16AndRotate(word);
     }
 
     debug(DSK_CHECKSUM,

Core/Misc/RetroShell/NavigatorConsole.cpp

@@ -635,6 +635,33 @@ NavigatorConsole::initCommands(RSCommand &root)
         });
     }
 
+    root.add({
+
+        .tokens = { "unmount" },
+        .chelp  = { "Unmount the file system" },
+        .flags  = vAmigaDOS ? rs::disabled : 0,
+        .func   = [this] (std::ostream &os, const Arguments &args, const std::vector<isize> &values) {
+
+            requireFS();
+
+            fs->flush();
+            fs = nullptr;
+        }
+    });
+
+    root.add({
+
+        .tokens = { "flush" },
+        .chelp  = { "Flush the file system cache" },
+        .flags  = vAmigaDOS ? rs::disabled : 0,
+        .func   = [this] (std::ostream &os, const Arguments &args, const std::vector<isize> &values) {
+
+            requireFS();
+
+            fs->flush();
+        }
+    });
+
     root.add({
 
         .tokens = { "import" },

Core/Peripherals/Drive/DiskEncoder.cpp

@@ -213,6 +213,7 @@ DiskEncoder::decodeAmigaTrack(ByteView track, TrackNr t, MutableByteView dst)
     // Find all sectors
     auto offsets = seekSectors(track);
 
+    /*
     for (isize i = 0; i < count; ++i) {
         if (!offsets.contains(i)) {
             warn("Sector %ld not found. Aborting.\n", i);
@@ -223,6 +224,7 @@ DiskEncoder::decodeAmigaTrack(ByteView track, TrackNr t, MutableByteView dst)
         warn("Found %zd sectors, expected %ld. Aborting.\n", offsets.size(), count);
         throw DeviceError(DeviceError::DSK_WRONG_SECTOR_COUNT);
     }
+    */
 
     // Decode all sectors
     for (SectorNr s = 0; s < count; s++) {
@@ -235,41 +237,6 @@ DiskEncoder::decodeAmigaTrack(ByteView track, TrackNr t, MutableByteView dst)
         auto *secData = dst.data() + s * bsize;
         decodeAmigaSector(track, offsets[s], span<u8>(secData, bsize));
     }
-
-/*
-    // Find all sync marks
-    auto it = track.cyclic_begin();
-    std::vector<isize> syncMarks;
-    syncMarks.reserve(count);
-
-    constexpr isize syncMarkLen = 4;
-    for (isize i = 0; i < track.size() + syncMarkLen; ++i, ++it) {
-
-        // Scan MFM stream for $4489 $4489
-        if (it[0] != 0x44) continue;
-        if (it[1] != 0x89) continue;
-        if (it[2] != 0x44) continue;
-        if (it[3] != 0x89) continue;
-
-        // Make sure it's not a DOS track
-        if (it[5] == 0x89) continue;
-
-        syncMarks.push_back(it.offset());
-    }
-
-    if (ADF_DEBUG) fprintf(stderr, "Found %zd sectors (expected %ld)\n", syncMarks.size(), count);
-
-    // Check that the track contains the proper amount of sync marks
-    if (isize(syncMarks.size()) != count) {
-
-        warn("Found %zd sectors, expected %ld. Aborting.\n", syncMarks.size(), count);
-        throw DeviceError(DeviceError::DSK_WRONG_SECTOR_COUNT);
-    }
-
-    // Decode all sectors
-    for (SectorNr s = 0; s < count; s++)
-        decodeAmigaSector(track, syncMarks[s], dst);
-*/
 }
 
 void
@@ -280,36 +247,19 @@ DiskEncoder::decodeAmigaSector(ByteView track, isize offset, MutableByteView dst
 
     if (MFM_DEBUG) fprintf(stderr, "Decoding sector at offset %ld\n", offset);
 
-    // Skip sync mark
-    offset += 4;
-
-    /*
-    // Decode sector info
-    u8 info[4]; decodeOddEven(info, &track[offset], 4);
+    // Skip sync mark + sector header
+    offset += 4 + 56;
 
-    // Extract the sector number
-    auto secNr = SectorNr(info[2]);
+    // Determine the source address
+    auto *mfmData = &track[offset];
 
-    if (MFM_DEBUG) fprintf(stderr, "Decoding sector %ld\n", secNr);
-    */
+    for (isize i = 0; i < 16; ++i) { printf("%0X ", mfmData[i]); } printf("\n");
 
-    // Check that the sector number is valid
-    /*
-    if (secNr * bsize + bsize > dst.size()) {
-
-        warn("Invalid sector number %ld. Aborting.\n", secNr);
-        throw DeviceError(DeviceError::DSK_INVALID_SECTOR_NUMBER);
-    }
-    */
-
-    // Determine the destination address
-    // auto *secData = dst.data() + secNr * bsize;
-
-    // Determine the source address (adding 56 skips the sector header)
-    auto *mfmData = &track[offset + 56];
 
     // Decode sector data
     decodeOddEven(dst.data(), mfmData, bsize);
+
+    for (isize i = 0; i < 8; ++i) { printf("%0X ", dst.data()[i]); } printf("\n");
 }
 
 optional<isize>

Core/Peripherals/Drive/FloppyDisk.cpp

@@ -115,7 +115,7 @@ FloppyDisk::readBlock(u8 *dst, isize nr) const
     if (!offset)
         throw IOError(DeviceError::DEV_SEEK_ERR, "Block " + std::to_string(nr));
 
-    debug(MFM_DEBUG, "Found sector (%ld,%ld) at offset %ld\n", t, s, *offset);
+    debug(MFM_DEBUG, "Found (%ld,%ld) at offset %ld\n", t, s, *offset);
     DiskEncoder::decodeAmigaSector(tdata, *offset, std::span<u8>(dst, 512));
 }
 
@@ -131,7 +131,7 @@ FloppyDisk::writeBlock(const u8 *src, isize nr)
     if (!offset)
         throw IOError(DeviceError::DEV_SEEK_ERR, "Block " + std::to_string(nr));
 
-    debug(MFM_DEBUG, "Found sector (%ld,%ld) at offset %ld\n", t, s, *offset);
+    debug(MFM_DEBUG, "Found (%ld,%ld) at offset %ld\n", t, s, *offset);
     DiskEncoder::encodeAmigaSector(tdata, *offset, t, s, std::span<const u8>(src, 512));
 }
 

Core/Peripherals/Drive/FloppyDrive.cpp

@@ -792,7 +792,7 @@ FloppyDrive::selectSide(HeadNr h)
 }
 
 u8
-FloppyDrive::readByte() const
+FloppyDrive::read8() const
 {
     // Case 1: No disk is inserted
     if (!disk) return 0xFF;
@@ -805,42 +805,42 @@ FloppyDrive::readByte() const
 }
 
 u8
-FloppyDrive::readByteAndRotate()
+FloppyDrive::read8AndRotate()
 {
-    u8 result = readByte();
+    u8 result = read8();
     if (motor) rotate();
     return result;
 }
 
 u16
-FloppyDrive::readWordAndRotate()
+FloppyDrive::read16AndRotate()
 {
-    u8 byte1 = readByteAndRotate();
-    u8 byte2 = readByteAndRotate();
+    u8 byte1 = read8AndRotate();
+    u8 byte2 = read8AndRotate();
 
     return HI_LO(byte1, byte2);
 }
 
 void
-FloppyDrive::writeByte(u8 value)
+FloppyDrive::write8(u8 value)
 {
     if (disk) {
         disk->write8(head.cylinder, head.head, head.offset, value);
     }
 }
 
 void
-FloppyDrive::writeByteAndRotate(u8 value)
+FloppyDrive::write8AndRotate(u8 value)
 {
-    writeByte(value);
+    write8(value);
     if (motor) rotate();
 }
 
 void
-FloppyDrive::writeWordAndRotate(u16 value)
+FloppyDrive::write16AndRotate(u16 value)
 {
-    writeByteAndRotate(HI_BYTE(value));
-    writeByteAndRotate(LO_BYTE(value));
+    write8AndRotate(HI_BYTE(value));
+    write8AndRotate(LO_BYTE(value));
 }
 
 void
@@ -869,8 +869,8 @@ FloppyDrive::findSyncMark()
 
     for (isize i = 0; i < length; i++) {
 
-        if (readByteAndRotate() != 0x44) continue;
-        if (readByteAndRotate() != 0x89) continue;
+        if (read8AndRotate() != 0x44) continue;
+        if (read8AndRotate() != 0x89) continue;
         break;
     }
 

Core/Peripherals/Drive/FloppyDrive.h

@@ -362,14 +362,14 @@ class FloppyDrive final : public Drive, public TrackDevice {
     void selectSide(HeadNr h);
 
     // Reads a value from the drive head and optionally rotates the disk
-    u8 readByte() const;
-    u8 readByteAndRotate();
-    u16 readWordAndRotate();
+    u8 read8() const;
+    u8 read8AndRotate();
+    u16 read16AndRotate();
 
     // Writes a value to the drive head and optionally rotates the disk
-    void writeByte(u8 value);
-    void writeByteAndRotate(u8 value);
-    void writeWordAndRotate(u16 value);
+    void write8(u8 value);
+    void write8AndRotate(u8 value);
+    void write16AndRotate(u16 value);
 
     // Emulate a disk rotation (moves head to the next byte)
     void rotate();

Core/Storage/FileSystems/FSDescriptor.cpp

@@ -10,6 +10,7 @@
 #include "config.h"
 #include "FSDescriptor.h"
 #include "BlockDevice.h"
+#include "ADFFile.h"
 #include "FSError.h"
 #include "utl/io.h"
 #include "utl/types/Literals.h"
@@ -53,16 +54,24 @@ FSDescriptor::init(isize numBlocks, FSFormat dos)
     this->dos = dos;
 
     // Determine the location of the root block
-    isize highKey = numBlocks - 1;
-    isize rootKey = (numReserved + highKey) / 2; 
-    rootBlock = BlockNr(rootKey);
+    if (numBlocks * 512 == ADFFile::ADFSIZE_35_DD_81 ||
+        numBlocks * 512 == ADFFile::ADFSIZE_35_DD_82 ||
+        numBlocks * 512 == ADFFile::ADFSIZE_35_DD_83 ||
+        numBlocks * 512 == ADFFile::ADFSIZE_35_DD_84) {
 
-    assert(rootKey == numBlocks / 2);
+        rootBlock = 880;
+
+    } else {
+
+        isize highKey = numBlocks - 1;
+        isize rootKey = (numReserved + highKey) / 2;
+        rootBlock = BlockNr(rootKey);
+    }
 
     // Determine the number of required bitmap blocks
     isize bitsPerBlock = (bsize - 4) * 8;
     isize neededBlocks = (numBlocks + bitsPerBlock - 1) / bitsPerBlock;
-    isize bmKey = rootKey + 1;
+    isize bmKey = rootBlock + 1;
 
     // Add bitmap blocks
     for (isize i = 0; i < neededBlocks; i++) {

Core/utlib/src/abilities/Dumpable.cpp

@@ -109,7 +109,7 @@ Dumpable::dump(std::ostream &os, const DumpOpt &opt, const string &fmt, DataProv
     };
 
     // Continue as long as data is available
-    while (reader(bcnt, 1) != -1 && reader(ccnt, 1) != -1) {
+    while (reader(bcnt, 1).has_value() && reader(ccnt, 1).has_value()) {
 
         // Rewind to the beginning of the format string
         const char *p = fmt.c_str();