salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update the Amiga to the new new architecture.

Browse Source
This commit is contained in:
David Given
2019-04-30 20:53:50 +02:00
parent 8bbbd1c1e1
commit 9140b822ee
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/amiga/amiga.h
View File

@@ -8,13 +8,13 @@
class Sector;
class Fluxmap;
class AmigaDecoder : public AbstractStatefulDecoder
class AmigaDecoder : public AbstractSimplifiedDecoder
{
public:
virtual ~AmigaDecoder() {}
nanoseconds_t findSector(FluxmapReader& fmr, Track& track);
void decodeSingleSector(FluxmapReader& fmr, Track& track, Sector& sector);
RecordType advanceToNextRecord();
void decodeSectorRecord();
};
#endif

21
lib/amiga/decoder.cc
View File

@@ -62,14 +62,17 @@ static uint32_t checksum(const Bytes& bytes)
return checksum & 0x55555555;
}
nanoseconds_t AmigaDecoder::findSector(FluxmapReader& fmr, Track& track)
AbstractSimplifiedDecoder::RecordType AmigaDecoder::advanceToNextRecord()
{
return fmr.seekToPattern(SECTOR_PATTERN);
_sector->clock = _fmr->seekToPattern(SECTOR_PATTERN);
if (_fmr->eof() || !_sector->clock)
return UNKNOWN_RECORD;
return SECTOR_RECORD;
}
void AmigaDecoder::decodeSingleSector(FluxmapReader& fmr, Track& track, Sector& sector)
void AmigaDecoder::decodeSectorRecord()
{
const auto& rawbits = fmr.readRawBits(AMIGA_RECORD_SIZE*16, sector.clock);
const auto& rawbits = readRawBits(AMIGA_RECORD_SIZE*16);
const auto& rawbytes = toBytes(rawbits).slice(0, AMIGA_RECORD_SIZE*2);
const auto& bytes = decodeFmMfm(rawbits).slice(0, AMIGA_RECORD_SIZE);
@@ -78,9 +81,9 @@ void AmigaDecoder::decodeSingleSector(FluxmapReader& fmr, Track& track, Sector&
Bytes header = deinterleave(ptr, 4);
Bytes recoveryinfo = deinterleave(ptr, 16);
sector.logicalTrack = header[1] >> 1;
sector.logicalSide = header[1] & 1;
sector.logicalSector = header[2];
_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));
@@ -89,6 +92,6 @@ void AmigaDecoder::decodeSingleSector(FluxmapReader& fmr, Track& track, Sector&
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;
_sector->data = deinterleave(ptr, 512);
_sector->status = (gotdatachecksum == wanteddatachecksum) ? Sector::OK : Sector::BAD_CHECKSUM;
}

18
meson.build
View File

@@ -133,14 +133,14 @@ aeslanierdecoderlib = declare_dependency(
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:
@@ -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])