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

Fix the flux to scp converter.

Browse Source
This commit is contained in:
David Given
2019-08-31 12:31:33 +02:00
parent 80badf3b54
commit 73766f92b4
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/fe-fluxtoscp.cc
View File

@@ -9,6 +9,7 @@
#include "decoders/fluxmapreader.h"
#include "scp.h"
#include <fstream>
#include <algorithm>
static FlagGroup flags { };
@@ -44,6 +45,16 @@ static void write_le32(uint8_t dest[4], uint32_t v)
dest[3] = v >> 24;
}
static int strackno(int track, int side)
{
if (fortyTrackMode)
track /= 2;
if (singleSided)
return track;
else
return (track << 1) | side;
}
int mainConvertFluxToScp(int argc, const char* argv[])
{
auto filenames = flags.parseFlagsWithFilenames(argc, argv);
@@ -54,18 +65,20 @@ int mainConvertFluxToScp(int argc, const char* argv[])
auto tracks = sqlFindFlux(inputDb);
int maxTrack = 0;
int maxSide = 0;
for (auto p : tracks)
{
if (singleSided && (p.second == 1))
continue;
if (p.first > maxTrack)
maxTrack = p.first;
maxTrack = std::max(maxTrack, (int)p.first);
maxSide = std::max(maxSide, (int)p.second);
}
int maxStrack = strackno(maxTrack, maxSide);
std::cout << fmt::format("Writing {} {} SCP file containing {} tracks\n",
std::cout << fmt::format("Writing {} {} SCP file containing {} SCP tracks\n",
fortyTrackMode ? "48 tpi" : "96 tpi",
singleSided ? "single sided" : "double sided",
(fortyTrackMode ? (maxTrack / 2) : maxTrack) + 1
maxStrack + 1
);
ScpHeader fileheader = {0};
@@ -76,7 +89,7 @@ int mainConvertFluxToScp(int argc, const char* argv[])
fileheader.type = diskType;
fileheader.revolutions = 5;
fileheader.start_track = 0;
fileheader.end_track = maxTrack;
fileheader.end_track = maxStrack;
fileheader.flags = SCP_FLAG_INDEXED | (fortyTrackMode ? 0 : SCP_FLAG_96TPI);
fileheader.cell_width = 0;
fileheader.heads = singleSided ? 1 : 0;
@@ -86,11 +99,11 @@ int mainConvertFluxToScp(int argc, const char* argv[])
int trackstep = 1 + fortyTrackMode;
int maxside = singleSided ? 0 : 1;
int strack = 0;
for (int track = 0; track <= maxTrack; track += trackstep)
{
for (int side = 0; side <= maxside; side++)
{
int strack = strackno(track, side);
std::cout << fmt::format("FE track {}.{}, SCP track {}: ", track, side, strack) << std::flush;
auto fluxmap = sqlReadFlux(inputDb, track, side);
@@ -127,7 +140,7 @@ int mainConvertFluxToScp(int argc, const char* argv[])
{
auto* revheader = &trackheader.revolution[revolution];
write_le32(revheader->offset, startOffset + sizeof(ScpTrack));
write_le32(revheader->length, fluxdataWriter.pos - startOffset);
write_le32(revheader->length, (fluxdataWriter.pos - startOffset) / 2);
write_le32(revheader->index, revTicks * NS_PER_TICK / 25);
revolution++;
revheader++;
@@ -158,7 +171,6 @@ int mainConvertFluxToScp(int argc, const char* argv[])
std::cout << fmt::format("{} ms in {} bytes\n",
totalTicks * MS_PER_TICK,
fluxdata.size());
strack++;
}
}

7
src/fe-scptoflux.cc
View File

@@ -81,6 +81,7 @@ static void read_track(int strack)
Fluxmap fluxmap;
nanoseconds_t pending = 0;
unsigned inputBytes = 0;
for (int revolution = 0; revolution < header.revolutions; revolution++)
{
if (revolution != 0)
@@ -107,10 +108,12 @@ static void read_track(int strack)
else
pending += 0x10000;
}
inputBytes += datalength*2;
}
std::cout << fmt::format(" {} ms in {} output bytes\n",
fluxmap.duration() / 1e6, fluxmap.bytes());
std::cout << fmt::format(" {} ms in {} input bytes and {} output bytes\n",
fluxmap.duration() / 1e6, inputBytes, fluxmap.bytes());
sqlWriteFlux(outputDb, trackno(strack), headno(strack), fluxmap);
}