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

Fix SCP writer to always write complete revolutions.

Browse Source 
There were a couple of problems that needed to be fixed:

- Fluxmaps can be produced with zero index pulses by encoders.
This is somewhat ambiguous but it's assumed that this means there
is exactly one revolution.

- The SCP unindexed mode wasn't properly supported, as it should
create equal-length revolutions not aligned to indexes. However,
fluxmaps don't contain any information on rotation speed. Therefore,
drop the ability to create unindexed SCPs and slightly change the
meaning of the option to not include pre-index data.

- Real flux reads can potentially produce duplicate index pulses.
Avoid creating zero-length revs.

- Fix off-by-one error for rev count.
This commit is contained in:
Thomas Daede
2021-12-06 06:43:55 -08:00
parent 422620f4fe
commit 634be4ae51
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fluxsink/fluxsink.proto
View File

@@ -20,7 +20,7 @@ message VcdFluxSinkProto {
message ScpFluxSinkProto {
optional string filename = 2 [default = "flux.scp", (help) = ".scp file to write to"];
optional bool align_with_index = 3 [default = false, (help) = "align data to track boundaries"];
optional bool align_with_index = 3 [default = false, (help) = "discard data before the first index pulse"];
optional int32 type_byte = 4 [default = 0xff, (help) = "set the SCP disk type byte"];
}

31
lib/fluxsink/scpfluxsink.cc
View File

@@ -49,7 +49,7 @@ public:
_fileheader.type = _config.type_byte();
_fileheader.start_track = strackno(config.cylinders().start(), config.heads().start());
_fileheader.end_track = strackno(config.cylinders().end(), config.heads().end());
_fileheader.flags = (_config.align_with_index() ? SCP_FLAG_INDEXED : 0)
_fileheader.flags = SCP_FLAG_INDEXED
| SCP_FLAG_96TPI;
_fileheader.cell_width = 0;
_fileheader.heads = singlesided;
@@ -96,10 +96,11 @@ public:
Bytes fluxdata;
ByteWriter fluxdataWriter(fluxdata);
if (_config.align_with_index())
int revolution = -1; // -1 indicates that we are before the first index pulse
if (_config.align_with_index()) {
fmr.skipToEvent(F_BIT_INDEX);
int revolution = 0;
revolution = 0;
}
unsigned revTicks = 0;
unsigned totalTicks = 0;
unsigned ticksSinceLastPulse = 0;
@@ -114,17 +115,25 @@ public:
totalTicks += ticks;
revTicks += ticks;
if (fmr.eof() || (event & F_BIT_INDEX))
// if we haven't output any revolutions yet by the end of the track,
// assume that the whole track is one rev
// also discard any duplicate index pulses
if (((fmr.eof() && revolution <= 0) || ((event & F_BIT_INDEX)) && revTicks > 0))
{
auto* revheader = &trackheader.revolution[revolution];
write_le32(revheader->offset, startOffset + sizeof(ScpTrack));
write_le32(revheader->length, (fluxdataWriter.pos - startOffset) / 2);
write_le32(revheader->index, revTicks * NS_PER_TICK / 25);
if (fmr.eof() && revolution == -1)
revolution = 0;
if (revolution >= 0) {
auto* revheader = &trackheader.revolution[revolution];
write_le32(revheader->offset, startOffset + sizeof(ScpTrack));
write_le32(revheader->length, (fluxdataWriter.pos - startOffset) / 2);
write_le32(revheader->index, revTicks * NS_PER_TICK / 25);
revheader++;
}
revolution++;
revheader++;
revTicks = 0;
startOffset = fluxdataWriter.pos;
}
if (fmr.eof()) break;
if (event & F_BIT_PULSE)
{
@@ -139,7 +148,7 @@ public:
}
}
_fileheader.revolutions = revolution - 1;
_fileheader.revolutions = revolution;
write_le32(_fileheader.track[strack], trackdataWriter.pos + sizeof(ScpHeader));
trackdataWriter += Bytes((uint8_t*)&trackheader, sizeof(trackheader));
trackdataWriter += fluxdata;