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

Lots more renaming.

Browse Source
This commit is contained in:
David Given
2025-10-14 22:53:26 +02:00
parent d17f6116f0
commit f63c8dadf1
33 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/algorithms/readerwriter.cc
View File

@@ -288,7 +288,7 @@ struct CombinationResult
};
static CombinationResult combineRecordAndSectors(
std::vector<std::shared_ptr<const DecodedTrack>>& tracks,
std::vector<std::shared_ptr<const Track>>& tracks,
Decoder& decoder,
const std::shared_ptr<const LogicalTrackLayout>& ltl)
{
@@ -355,7 +355,7 @@ struct ReadGroupResult
static ReadGroupResult readGroup(const DiskLayout& diskLayout,
FluxSourceIteratorHolder& fluxSourceIteratorHolder,
const std::shared_ptr<const LogicalTrackLayout>& ltl,
std::vector<std::shared_ptr<const DecodedTrack>>& tracks,
std::vector<std::shared_ptr<const Track>>& tracks,
Decoder& decoder)
{
ReadGroupResult rgr = {BAD_AND_CAN_NOT_RETRY};
@@ -526,7 +526,7 @@ void writeTracksAndVerify(const DiskLayout& diskLayout,
[&](const std::shared_ptr<const LogicalTrackLayout>& ltl)
{
FluxSourceIteratorHolder fluxSourceIteratorHolder(fluxSource);
std::vector<std::shared_ptr<const DecodedTrack>> tracks;
std::vector<std::shared_ptr<const Track>> tracks;
auto [result, sectors] = readGroup(
diskLayout, fluxSourceIteratorHolder, ltl, tracks, decoder);
log(TrackReadLogMessage{tracks, sectors});
@@ -680,7 +680,7 @@ TracksAndSectors readAndDecodeTrack(const DiskLayout& diskLayout,
void readDiskCommand(const DiskLayout& diskLayout,
FluxSource& fluxSource,
Decoder& decoder,
DecodedDisk& decodedDisk)
Disk& decodedDisk)
{
std::unique_ptr<FluxSinkFactory> outputFluxSinkFactory;
if (globalConfig()->decoder().has_copy_flux_to())
@@ -785,7 +785,7 @@ void readDiskCommand(const DiskLayout& diskLayout,
/* Log a _copy_ of the decodedDisk structure so that the logger
* doesn't see the decodedDisk get mutated in subsequent reads. */
log(DiskReadLogMessage{std::make_shared<DecodedDisk>(decodedDisk)});
log(DiskReadLogMessage{std::make_shared<Disk>(decodedDisk)});
}
}
@@ -800,7 +800,7 @@ void readDiskCommand(const DiskLayout& diskLayout,
Decoder& decoder,
ImageWriter& writer)
{
DecodedDisk decodedDisk;
Disk decodedDisk;
readDiskCommand(diskLayout, fluxsource, decoder, decodedDisk);
writer.printMap(*decodedDisk.image);

14
lib/algorithms/readerwriter.h
View File

@@ -3,8 +3,8 @@
#include "lib/data/locations.h"
class DecodedDisk;
class DecodedTrack;
class Disk;
class Track;
class Decoder;
class DiskLayout;
class Encoder;
@@ -30,13 +30,13 @@ struct EndSpeedOperationLogMessage
struct TrackReadLogMessage
{
std::vector<std::shared_ptr<const DecodedTrack>> tracks;
std::vector<std::shared_ptr<const Track>> tracks;
std::vector<std::shared_ptr<const Sector>> sectors;
};
struct DiskReadLogMessage
{
std::shared_ptr<const DecodedDisk> disk;
std::shared_ptr<const Disk> disk;
};
struct BeginReadOperationLogMessage
@@ -47,7 +47,7 @@ struct BeginReadOperationLogMessage
struct EndReadOperationLogMessage
{
std::shared_ptr<const DecodedTrack> trackDataFlux;
std::shared_ptr<const Track> trackDataFlux;
std::set<std::shared_ptr<const Sector>> sectors;
};
@@ -112,7 +112,7 @@ extern void writeRawDiskCommand(
struct TracksAndSectors
{
std::vector<std::shared_ptr<const DecodedTrack>> tracks;
std::vector<std::shared_ptr<const Track>> tracks;
std::vector<std::shared_ptr<const Sector>> sectors;
};
@@ -124,7 +124,7 @@ extern TracksAndSectors readAndDecodeTrack(const DiskLayout& diskLayout,
extern void readDiskCommand(const DiskLayout& diskLayout,
FluxSource& fluxsource,
Decoder& decoder,
DecodedDisk& diskflux);
Disk& diskflux);
extern void readDiskCommand(const DiskLayout& diskLayout,
FluxSource& source,
Decoder& decoder,

4
lib/core/logger.h
View File

@@ -4,8 +4,8 @@
#include "fmt/format.h"
#include <type_traits>
class DecodedDisk;
class DecodedTrack;
class Disk;
class Track;
class Sector;
class LogRenderer;

4
lib/data/build.py
View File

@@ -3,7 +3,7 @@ from build.c import cxxlibrary
cxxlibrary(
name="data",
srcs=[
"./decoded.cc",
"./disk.cc",
"./fluxmap.cc",
"./fluxmapreader.cc",
"./fluxpattern.cc",
@@ -13,7 +13,7 @@ cxxlibrary(
"./sector.cc",
],
hdrs={
"lib/data/decoded.h": "./decoded.h",
"lib/data/disk.h": "./disk.h",
"lib/data/fluxmap.h": "./fluxmap.h",
"lib/data/sector.h": "./sector.h",
"lib/data/layout.h": "./layout.h",

13
lib/data/decoded.cc → lib/data/disk.cc
View File

@@ -1,5 +1,5 @@
#include "lib/core/globals.h"
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "lib/data/image.h"
#include "lib/data/layout.h"
#include "lib/data/sector.h"
@@ -19,11 +19,12 @@ namespace
inline constexpr pair_to_range_t pair_to_range{};
}
void DecodedDisk::populateTrackDataFromImage(const DiskLayout& diskLayout)
{
tracksByPhysicalLocation.clear();
sectorsByPhysicalLocation.clear();
Disk::Disk() {}
Disk::Disk(
const std::shared_ptr<const Image>& image, const DiskLayout& diskLayout):
image(image)
{
std::multimap<CylinderHead, std::shared_ptr<const Sector>>
sectorsGroupedByTrack;
for (const auto& sector : *image)
@@ -37,7 +38,7 @@ void DecodedDisk::populateTrackDataFromImage(const DiskLayout& diskLayout)
diskLayout.layoutByPhysicalLocation.at(physicalLocation);
const auto& ltl = ptl->logicalTrackLayout;
auto decodedTrack = std::make_shared<DecodedTrack>();
auto decodedTrack = std::make_shared<Track>();
decodedTrack->ltl = ltl;
decodedTrack->ptl = ptl;
tracksByPhysicalLocation.insert(

18
lib/data/decoded.h → lib/data/disk.h
View File

@@ -20,7 +20,7 @@ struct Record
Bytes rawData;
};
struct DecodedTrack
struct Track
{
std::shared_ptr<const LogicalTrackLayout> ltl;
std::shared_ptr<const PhysicalTrackLayout> ptl;
@@ -29,17 +29,23 @@ struct DecodedTrack
std::vector<std::shared_ptr<const Sector>> sectors;
};
struct DecodedDisk
struct Disk
{
DecodedDisk& operator=(const DecodedDisk& other) = default;
Disk();
std::multimap<CylinderHead, std::shared_ptr<const DecodedTrack>>
/* Creates a Disk from an Image, populating the tracks and sectors maps
* based on the supplied disk layout. */
Disk(const std::shared_ptr<const Image>& image,
const DiskLayout& diskLayout);
Disk& operator=(const Disk& other) = default;
std::multimap<CylinderHead, std::shared_ptr<const Track>>
tracksByPhysicalLocation;
std::multimap<CylinderHead, std::shared_ptr<const Sector>>
sectorsByPhysicalLocation;
std::shared_ptr<const Image> image;
void populateTrackDataFromImage(const DiskLayout& diskLayout);
};
#endif

2
lib/data/layout.h
View File

@@ -1,7 +1,7 @@
#ifndef LAYOUT_H
#define LAYOUT_H
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "lib/config/layout.pb.h"
#include "lib/config/config.h"
#include "lib/data/locations.h"

2
lib/data/sector.cc
View File

@@ -1,5 +1,5 @@
#include "lib/core/globals.h"
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "lib/data/sector.h"
#include "lib/data/layout.h"

6
lib/decoders/decoders.cc
View File

@@ -4,7 +4,7 @@
#include "lib/config/config.h"
#include "lib/decoders/decoders.h"
#include "lib/data/fluxmapreader.h"
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "protocol.h"
#include "lib/decoders/rawbits.h"
#include "lib/data/sector.h"
@@ -13,13 +13,13 @@
#include "lib/data/layout.h"
#include <numeric>
std::shared_ptr<DecodedTrack> Decoder::decodeToSectors(
std::shared_ptr<Track> Decoder::decodeToSectors(
std::shared_ptr<const Fluxmap> fluxmap,
const std::shared_ptr<const PhysicalTrackLayout>& ptl)
{
_ltl = ptl->logicalTrackLayout;
_trackdata = std::make_shared<DecodedTrack>();
_trackdata = std::make_shared<Track>();
_trackdata->fluxmap = fluxmap;
_trackdata->ptl = ptl;
_trackdata->ltl = ptl->logicalTrackLayout;

6
lib/decoders/decoders.h
View File

@@ -15,7 +15,7 @@ class PhysicalTrackLayout;
class RawBits;
class Sector;
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
extern void setDecoderManualClockRate(double clockrate_us);
@@ -53,7 +53,7 @@ public:
};
public:
std::shared_ptr<DecodedTrack> decodeToSectors(
std::shared_ptr<Track> decodeToSectors(
std::shared_ptr<const Fluxmap> fluxmap,
const std::shared_ptr<const PhysicalTrackLayout>& ptl);
@@ -106,7 +106,7 @@ protected:
const DecoderProto& _config;
std::shared_ptr<const LogicalTrackLayout> _ltl;
std::shared_ptr<DecodedTrack> _trackdata;
std::shared_ptr<Track> _trackdata;
std::shared_ptr<Sector> _sector;
std::unique_ptr<FluxDecoder> _decoder;
std::vector<bool> _recordBits;

2
lib/fluxsink/fluxsink.h
View File

@@ -15,7 +15,7 @@ class VcdFluxSinkProto;
class ScpFluxSinkProto;
class Fl2FluxSinkProto;
class Config;
class DecodedDisk;
class Disk;
class FluxSink
{

4
lib/fluxsource/fluxsource.h
View File

@@ -7,7 +7,7 @@
class A2rFluxSourceProto;
class CwfFluxSourceProto;
class DecodedDisk;
class Disk;
class EraseFluxSourceProto;
class Fl2FluxSourceProto;
class FluxSourceProto;
@@ -58,7 +58,7 @@ private:
public:
static std::unique_ptr<FluxSource> createMemoryFluxSource(
const DecodedDisk& flux);
const Disk& flux);
static std::unique_ptr<FluxSource> create(Config& config);
static std::unique_ptr<FluxSource> create(const FluxSourceProto& spec);

12
lib/fluxsource/memoryfluxsource.cc
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h"
#include "lib/data/fluxmap.h"
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "lib/fluxsource/fluxsource.h"
#include "lib/data/fluxmap.h"
#include "lib/data/layout.h"
@@ -8,8 +8,7 @@
class MemoryFluxSourceIterator : public FluxSourceIterator
{
using multimap =
std::multimap<CylinderHead, std::shared_ptr<const DecodedTrack>>;
using multimap = std::multimap<CylinderHead, std::shared_ptr<const Track>>;
public:
MemoryFluxSourceIterator(
@@ -39,7 +38,7 @@ private:
class MemoryFluxSource : public FluxSource
{
public:
MemoryFluxSource(const DecodedDisk& flux): _flux(flux)
MemoryFluxSource(const Disk& flux): _flux(flux)
{
std::set<CylinderHead> chs;
for (auto& [ch, trackDataFlux] : flux.tracksByPhysicalLocation)
@@ -63,11 +62,10 @@ public:
void recalibrate() override {}
private:
const DecodedDisk& _flux;
const Disk& _flux;
};
std::unique_ptr<FluxSource> FluxSource::createMemoryFluxSource(
const DecodedDisk& flux)
std::unique_ptr<FluxSource> FluxSource::createMemoryFluxSource(const Disk& flux)
{
return std::make_unique<MemoryFluxSource>(flux);
}

2
lib/imagewriter/rawimagewriter.cc
View File

@@ -3,7 +3,7 @@
#include "lib/data/sector.h"
#include "lib/imagewriter/imagewriter.h"
#include "lib/data/image.h"
#include "lib/data/decoded.h"
#include "lib/data/disk.h"
#include "lib/core/logger.h"
#include "lib/imagewriter/imagewriter.pb.h"
#include <algorithm>