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

Partially complete rework of all the decoders to avoid seeking inside the

Browse Source 
fluxmap. This requires resetting the FluxDecoder, which loses any pending
state, resulting in bad reads for (some) formats which don't have gaps between
sectors --- the DVK MX is the main victim.
This commit is contained in:
David Given
2022-02-12 00:55:09 +01:00
parent 610b7fe95c
commit 0933dc1afa
20 changed files with 204 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/decoders/decoders.cc
View File

@@ -68,58 +68,46 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
FluxmapReader fmr(*fluxmap);
_fmr = &fmr;
beginTrack();
for (;;)
{
auto newSector = [&] {
_sector = std::make_shared<Sector>();
_sector->status = Sector::MISSING;
_sector->physicalCylinder = physicalCylinder;
_sector->physicalHead = physicalHead;
};
newSector();
beginTrack();
for (;;)
{
newSector();
Fluxmap::Position recordStart = fmr.tell();
_decoder.reset(new FluxDecoder(&fmr, _sector->clock, _config));
RecordType r = advanceToNextRecord();
if (fmr.eof() || !_sector->clock)
_sector->clock = advanceToNextRecord();
if (fmr.eof() || !_sector->clock)
return std::move(_trackdata);
if ((r == UNKNOWN_RECORD) || (r == DATA_RECORD))
{
fmr.skipToEvent(F_BIT_PULSE);
continue;
}
/* Read the sector record. */
recordStart = fmr.tell();
resetFluxDecoder();
decodeSectorRecord();
Fluxmap::Position recordEnd = fmr.tell();
pushRecord(recordStart, recordEnd);
if (_sector->status == Sector::DATA_MISSING)
{
/* The data is in a separate record. */
_sector->headerStartTime = recordStart.ns();
_sector->headerEndTime = recordEnd.ns();
for (;;)
{
r = advanceToNextRecord();
if (r != UNKNOWN_RECORD)
_sector->clock = advanceToNextRecord();
if (fmr.eof() || !_sector->clock)
break;
if (fmr.eof())
break;
decodeDataRecord();
if (_sector->status != Sector::DATA_MISSING)
break;
fmr.skipToEvent(F_BIT_PULSE);
}
recordStart = fmr.tell();
if (r == DATA_RECORD)
{
resetFluxDecoder();
decodeDataRecord();
}
recordEnd = fmr.tell();
pushRecord(recordStart, recordEnd);
}
_sector->dataStartTime = recordStart.ns();
_sector->dataEndTime = recordEnd.ns();
if (_sector->status != Sector::MISSING)
_trackdata->sectors.push_back(_sector);
@@ -149,6 +137,20 @@ void AbstractDecoder::resetFluxDecoder()
_decoder.reset(new FluxDecoder(_fmr, _sector->clock, _config));
}
nanoseconds_t AbstractDecoder::seekToPattern(const FluxMatcher& pattern)
{
_fmr->skipToEvent(F_BIT_PULSE);
nanoseconds_t clock = _fmr->seekToPattern(pattern);
_decoder.reset(new FluxDecoder(_fmr, clock, _config));
return clock;
}
void AbstractDecoder::seekToIndexMark()
{
_fmr->skipToEvent(F_BIT_PULSE);
_fmr->seekToIndexMark();
}
std::vector<bool> AbstractDecoder::readRawBits(unsigned count)
{
return _decoder->readBits(count);