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

Port Apple 2 to the new new architecture.

Browse Source
This commit is contained in:
David Given
2019-04-30 20:57:51 +02:00
parent 2ba38b097a
commit d46d7db082
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/apple2/apple2.h
View File

@@ -10,15 +10,14 @@
class Sector; class Sector;
class Fluxmap; class Fluxmap;
class Apple2Decoder : public AbstractSplitDecoder class Apple2Decoder : public AbstractSimplifiedDecoder
{ {
public: public:
virtual ~Apple2Decoder() {} virtual ~Apple2Decoder() {}
nanoseconds_t findSector(FluxmapReader& fmr, Track& track) override; RecordType advanceToNextRecord();
nanoseconds_t findData(FluxmapReader& fmr, Track& track) override; void decodeSectorRecord();
void decodeHeader(FluxmapReader& fmr, Track& track, Sector& sector) override; void decodeDataRecord();
void decodeData(FluxmapReader& fmr, Track& track, Sector& sector) override;
}; };

41
lib/apple2/decoder.cc
View File

@@ -13,7 +13,7 @@
const FluxPattern SECTOR_RECORD_PATTERN(24, APPLE2_SECTOR_RECORD); const FluxPattern SECTOR_RECORD_PATTERN(24, APPLE2_SECTOR_RECORD);
const FluxPattern DATA_RECORD_PATTERN(24, APPLE2_DATA_RECORD); const FluxPattern DATA_RECORD_PATTERN(24, APPLE2_DATA_RECORD);
const FluxMatchers SECTOR_OR_DATA_RECORD_PATTERN({ &SECTOR_RECORD_PATTERN, &DATA_RECORD_PATTERN }); const FluxMatchers ANY_RECORD_PATTERN({ &SECTOR_RECORD_PATTERN, &DATA_RECORD_PATTERN });
static int decode_data_gcr(uint8_t gcr) static int decode_data_gcr(uint8_t gcr)
{ {
@@ -65,47 +65,48 @@ uint8_t combine(uint16_t word)
return word & (word >> 7); return word & (word >> 7);
} }
nanoseconds_t Apple2Decoder::findSector(FluxmapReader& fmr, Track& track) AbstractSimplifiedDecoder::RecordType Apple2Decoder::advanceToNextRecord()
{ {
return fmr.seekToPattern(SECTOR_RECORD_PATTERN); const FluxMatcher* matcher = nullptr;
_sector->clock = _fmr->seekToPattern(ANY_RECORD_PATTERN, matcher);
if (matcher == &SECTOR_RECORD_PATTERN)
return RecordType::SECTOR_RECORD;
if (matcher == &DATA_RECORD_PATTERN)
return RecordType::DATA_RECORD;
return RecordType::UNKNOWN_RECORD;
} }
nanoseconds_t Apple2Decoder::findData(FluxmapReader& fmr, Track& track) void Apple2Decoder::decodeSectorRecord()
{
return fmr.seekToPattern(SECTOR_OR_DATA_RECORD_PATTERN);
}
void Apple2Decoder::decodeHeader(FluxmapReader& fmr, Track& track, Sector& sector)
{ {
/* Skip ID (as we know it's a APPLE2_SECTOR_RECORD). */ /* Skip ID (as we know it's a APPLE2_SECTOR_RECORD). */
fmr.readRawBits(24, sector.clock); readRawBits(24);
/* Read header. */ /* Read header. */
auto header = toBytes(fmr.readRawBits(8*8, sector.clock)).slice(0, 8); auto header = toBytes(readRawBits(8*8)).slice(0, 8);
ByteReader br(header); ByteReader br(header);
uint8_t volume = combine(br.read_be16()); uint8_t volume = combine(br.read_be16());
sector.logicalTrack = combine(br.read_be16()); _sector->logicalTrack = combine(br.read_be16());
sector.logicalSector = combine(br.read_be16()); _sector->logicalSector = combine(br.read_be16());
uint8_t checksum = combine(br.read_be16()); uint8_t checksum = combine(br.read_be16());
if (checksum == (volume ^ sector.logicalTrack ^ sector.logicalSector)) if (checksum == (volume ^ _sector->logicalTrack ^ _sector->logicalSector))
sector.status = Sector::DATA_MISSING; /* unintuitive but correct */ _sector->status = Sector::DATA_MISSING; /* unintuitive but correct */
} }
void Apple2Decoder::decodeData(FluxmapReader& fmr, Track& track, Sector& sector) void Apple2Decoder::decodeDataRecord()
{ {
/* Check ID. */ /* Check ID. */
Bytes bytes = toBytes(fmr.readRawBits(3*8, sector.clock)).slice(0, 3); Bytes bytes = toBytes(readRawBits(3*8)).slice(0, 3);
if (bytes.reader().read_be24() != APPLE2_DATA_RECORD) if (bytes.reader().read_be24() != APPLE2_DATA_RECORD)
return; return;
/* Read and decode data. */ /* Read and decode data. */
unsigned recordLength = APPLE2_ENCODED_SECTOR_LENGTH + 2; unsigned recordLength = APPLE2_ENCODED_SECTOR_LENGTH + 2;
bytes = toBytes(fmr.readRawBits(recordLength*8, sector.clock)).slice(0, recordLength); bytes = toBytes(readRawBits(recordLength*8)).slice(0, recordLength);
sector.status = Sector::BAD_CHECKSUM; _sector->status = Sector::BAD_CHECKSUM;
sector.data = decode_crazy_data(&bytes[0], sector.status); _sector->data = decode_crazy_data(&bytes[0], _sector->status);
} }

18
meson.build
View File

@@ -142,14 +142,14 @@ amigadecoderlib = declare_dependency(
include_directories('lib/amiga') include_directories('lib/amiga')
) )
# apple2decoderlib = declare_dependency( apple2decoderlib = declare_dependency(
# link_with: link_with:
# shared_library('apple2decoderlib', shared_library('apple2decoderlib',
# [ 'lib/apple2/decoder.cc', ], [ 'lib/apple2/decoder.cc', ],
# dependencies: [fmtlib, felib, decoderlib]), dependencies: [fmtlib, felib, decoderlib]),
# include_directories: include_directories:
# include_directories('lib/apple2') include_directories('lib/apple2')
# ) )
brotherdecoderlib = declare_dependency( brotherdecoderlib = declare_dependency(
link_with: link_with:
@@ -238,7 +238,7 @@ executable('fe-readadfs', ['src/fe-readadfs.cc'], dependencies
executable('fe-readaeslanier', ['src/fe-readaeslanier.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, aeslanierdecoderlib]) 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-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-readapple2', ['src/fe-readapple2.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, apple2decoderlib])
executable('fe-readbrother', ['src/fe-readbrother.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, brotherdecoderlib]) executable('fe-readbrother', ['src/fe-readbrother.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, brotherdecoderlib])
# executable('fe-readc64', ['src/fe-readc64.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, c64decoderlib]) # executable('fe-readc64', ['src/fe-readc64.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, c64decoderlib])
executable('fe-readdfs', ['src/fe-readdfs.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib]) executable('fe-readdfs', ['src/fe-readdfs.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib])