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

Replace the flux decoder with a PLL-based one stolen from samdisk. It almost

Browse Source 
works.
This commit is contained in:
David Given
2021-11-25 00:00:51 +01:00
parent 28aff78469
commit 20ade1de7b
8 changed files with 117 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/decoders/decoders.cc
View File

@@ -78,6 +78,7 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
_sector->physicalHead = physicalHead;
Fluxmap::Position recordStart = fmr.tell();
_decoder.reset(new FluxDecoder(&fmr, _sector->clock, _config));
RecordType r = advanceToNextRecord();
if (fmr.eof() || !_sector->clock)
return std::move(_trackdata);
@@ -90,6 +91,7 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
/* Read the sector record. */
recordStart = fmr.tell();
_decoder.reset(new FluxDecoder(&fmr, _sector->clock, _config));
decodeSectorRecord();
Fluxmap::Position recordEnd = fmr.tell();
pushRecord(recordStart, recordEnd);
@@ -109,7 +111,10 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
}
recordStart = fmr.tell();
if (r == DATA_RECORD)
{
_decoder.reset(new FluxDecoder(&fmr, _sector->clock, _config));
decodeDataRecord();
}
recordEnd = fmr.tell();
pushRecord(recordStart, recordEnd);
}
@@ -133,13 +138,14 @@ void AbstractDecoder::pushRecord(const Fluxmap::Position& start, const Fluxmap::
record->clock = _sector->clock;
_fmr->seek(start);
record->rawData = toBytes(_fmr->readRawBits(end, _sector->clock));
FluxDecoder decoder(_fmr, _sector->clock, _config);
record->rawData = toBytes(decoder.readBits(end));
_fmr->seek(here);
}
std::vector<bool> AbstractDecoder::readRawBits(unsigned count)
{
return _fmr->readRawBits(count, _sector->clock);
return _decoder->readBits(count);
}
std::set<unsigned> AbstractDecoder::requiredSectors(unsigned cylinder, unsigned head) const