From a692382ea206cea8c5669217c4860906fd56ed4a Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 27 Apr 2019 23:22:32 +0200 Subject: [PATCH] Update the Amiga decoder for the new architecture. --- lib/amiga/amiga.h | 10 +++---- lib/amiga/decoder.cc | 71 +++++++++++++++++--------------------------- meson.build | 22 +++++++------- 3 files changed, 43 insertions(+), 60 deletions(-) diff --git a/lib/amiga/amiga.h b/lib/amiga/amiga.h index e3561166..cda96027 100644 --- a/lib/amiga/amiga.h +++ b/lib/amiga/amiga.h @@ -3,18 +3,18 @@ #define AMIGA_SECTOR_RECORD 0xaaaa44894489LL +#define AMIGA_RECORD_SIZE 0x21f + class Sector; class Fluxmap; -class AmigaDecoder : public AbstractSoftSectorDecoder +class AmigaDecoder : public AbstractStatefulDecoder { public: virtual ~AmigaDecoder() {} - SectorVector decodeToSectors( - const RawRecordVector& rawRecords, unsigned physicalTrack, unsigned physicalSide); - nanoseconds_t guessClock(Fluxmap& fluxmap) const; - int recordMatcher(uint64_t fifo) const; + nanoseconds_t findSector(FluxmapReader& fmr, Track& track); + void decodeSingleSector(FluxmapReader& fmr, Track& track, Sector& sector); }; #endif diff --git a/lib/amiga/decoder.cc b/lib/amiga/decoder.cc index 6968dfbd..edbc053a 100644 --- a/lib/amiga/decoder.cc +++ b/lib/amiga/decoder.cc @@ -1,5 +1,6 @@ #include "globals.h" #include "fluxmap.h" +#include "fluxmapreader.h" #include "protocol.h" #include "record.h" #include "decoders.h" @@ -18,6 +19,8 @@ * MFM works. */ +static const FluxPattern SECTOR_PATTERN(48, AMIGA_SECTOR_RECORD); + static Bytes deinterleave(const uint8_t*& input, size_t len) { assert(!(len & 1)); @@ -59,53 +62,33 @@ static uint32_t checksum(const Bytes& bytes) return checksum & 0x55555555; } -SectorVector AmigaDecoder::decodeToSectors(const RawRecordVector& rawRecords, unsigned, unsigned) +nanoseconds_t AmigaDecoder::findSector(FluxmapReader& fmr, Track& track) { - std::vector> sectors; - - for (auto& rawrecord : rawRecords) - { - const auto& rawdata = rawrecord->data; - const auto& rawbytes = toBytes(rawdata); - const auto& bytes = decodeFmMfm(rawdata); - - if (bytes.size() < 544) - continue; - - const uint8_t* ptr = bytes.begin() + 4; - - Bytes header = deinterleave(ptr, 4); - Bytes recoveryinfo = deinterleave(ptr, 16); - - uint32_t wantedheaderchecksum = deinterleave(ptr, 4).reader().read_be32(); - uint32_t gotheaderchecksum = checksum(rawbytes.slice(8, 40)); - if (gotheaderchecksum != wantedheaderchecksum) - continue; - - uint32_t wanteddatachecksum = deinterleave(ptr, 4).reader().read_be32(); - uint32_t gotdatachecksum = checksum(rawbytes.slice(64, 1024)); - int status = (gotdatachecksum == wanteddatachecksum) ? Sector::OK : Sector::BAD_CHECKSUM; - - Bytes databytes = deinterleave(ptr, 512); - unsigned track = header[1] >> 1; - unsigned side = header[1] & 1; - auto sector = std::unique_ptr( - new Sector(status, track, side, header[2], databytes)); - sectors.push_back(std::move(sector)); - } - - return sectors; + return fmr.seekToPattern(SECTOR_PATTERN); } -nanoseconds_t AmigaDecoder::guessClock(Fluxmap& fluxmap) const +void AmigaDecoder::decodeSingleSector(FluxmapReader& fmr, Track& track, Sector& sector) { - return fluxmap.guessClock() / 2; -} + const auto& rawbits = fmr.readRawBits(AMIGA_RECORD_SIZE*16, sector.clock); + const auto& rawbytes = toBytes(rawbits).slice(0, AMIGA_RECORD_SIZE*2); + const auto& bytes = decodeFmMfm(rawbits).slice(0, AMIGA_RECORD_SIZE); -int AmigaDecoder::recordMatcher(uint64_t fifo) const -{ - uint64_t masked = fifo & 0xffffffffffffULL; - if (masked == AMIGA_SECTOR_RECORD) - return 64; - return 0; + const uint8_t* ptr = bytes.begin() + 3; + + Bytes header = deinterleave(ptr, 4); + Bytes recoveryinfo = deinterleave(ptr, 16); + + sector.logicalTrack = header[1] >> 1; + sector.logicalSide = header[1] & 1; + sector.logicalSector = header[2]; + + uint32_t wantedheaderchecksum = deinterleave(ptr, 4).reader().read_be32(); + uint32_t gotheaderchecksum = checksum(rawbytes.slice(6, 40)); + if (gotheaderchecksum != wantedheaderchecksum) + return; + + uint32_t wanteddatachecksum = deinterleave(ptr, 4).reader().read_be32(); + uint32_t gotdatachecksum = checksum(rawbytes.slice(62, 1024)); + sector.data = deinterleave(ptr, 512); + sector.status = (gotdatachecksum == wanteddatachecksum) ? Sector::OK : Sector::BAD_CHECKSUM; } diff --git a/meson.build b/meson.build index 0666be79..25abfce0 100644 --- a/meson.build +++ b/meson.build @@ -132,16 +132,16 @@ encoderlib = declare_dependency( # include_directories: # include_directories('lib/aeslanier') #) -# -#amigadecoderlib = declare_dependency( -# link_with: -# shared_library('amigadecoderlib', -# [ 'lib/amiga/decoder.cc', ], -# dependencies: [fmtlib, felib, decoderlib]), -# include_directories: -# include_directories('lib/amiga') -#) -# + +amigadecoderlib = declare_dependency( + link_with: + shared_library('amigadecoderlib', + [ 'lib/amiga/decoder.cc', ], + dependencies: [fmtlib, felib, decoderlib]), + include_directories: + include_directories('lib/amiga') +) + #apple2decoderlib = declare_dependency( # link_with: # shared_library('apple2decoderlib', @@ -236,7 +236,7 @@ executable('fe-erase', ['src/fe-erase.cc'], dependencies executable('fe-inspect', ['src/fe-inspect.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib]) executable('fe-readadfs', ['src/fe-readadfs.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib]) #executable('fe-readaeslanier', ['src/fe-readaeslanier.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, aeslanierdecoderlib]) -#executable('fe-readamiga', ['src/fe-readamiga.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, amigadecoderlib]) +executable('fe-readamiga', ['src/fe-readamiga.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, amigadecoderlib]) executable('fe-readampro', ['src/fe-readampro.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib]) #executable('fe-readapple2', ['src/fe-readapple2.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, apple2decoderlib]) #executable('fe-readbrother', ['src/fe-readbrother.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, brotherdecoderlib])