From c5373480baf25d36e17eb17d14d8255468440a8b Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 13 Oct 2024 13:35:48 +0200 Subject: [PATCH] Move a lot of the data-handling utilities into their own module. --- arch/aeslanier/decoder.cc | 4 +- arch/agat/decoder.cc | 4 +- arch/agat/encoder.cc | 4 +- arch/amiga/decoder.cc | 4 +- arch/amiga/encoder.cc | 2 +- arch/apple2/decoder.cc | 4 +- arch/apple2/encoder.cc | 4 +- arch/brother/decoder.cc | 4 +- arch/brother/encoder.cc | 2 +- arch/c64/decoder.cc | 4 +- arch/c64/encoder.cc | 6 +- arch/f85/decoder.cc | 4 +- arch/fb100/decoder.cc | 4 +- arch/ibm/decoder.cc | 6 +- arch/ibm/encoder.cc | 4 +- arch/macintosh/decoder.cc | 4 +- arch/macintosh/encoder.cc | 4 +- arch/micropolis/decoder.cc | 4 +- arch/micropolis/encoder.cc | 4 +- arch/mx/decoder.cc | 4 +- arch/northstar/decoder.cc | 4 +- arch/northstar/encoder.cc | 4 +- arch/rolandd20/decoder.cc | 4 +- arch/smaky6/decoder.cc | 4 +- arch/tartu/decoder.cc | 25 ++-- arch/tartu/encoder.cc | 4 +- arch/tids990/decoder.cc | 4 +- arch/tids990/encoder.cc | 2 +- arch/victor9k/decoder.cc | 4 +- arch/victor9k/encoder.cc | 6 +- arch/zilogmcz/decoder.cc | 4 +- build.py | 13 +- lib/core/build.py | 1 + lib/{ => core}/logrenderer.cc | 3 - lib/{ => data}/flux.h | 0 lib/data/fluxmap.cc | 77 +++++++++++ lib/{ => data}/fluxmap.h | 13 -- lib/{ => data}/image.cc | 6 +- lib/{ => data}/image.h | 0 lib/{ => data}/layout.cc | 3 +- lib/{ => data}/layout.h | 2 +- lib/{ => data}/sector.cc | 6 +- lib/{ => data}/sector.h | 2 +- lib/decoders/decoders.cc | 10 +- lib/decoders/decoders.h | 4 +- lib/decoders/fluxdecoder.cc | 2 +- lib/decoders/fluxmapreader.cc | 86 ++++++++++++- lib/decoders/fluxmapreader.h | 15 ++- lib/decoders/fluxpattern.cc | 2 +- lib/decoders/fluxpattern.h | 2 +- lib/encoders/encoders.cc | 6 +- lib/fl2.cc | 2 +- lib/fluxmap.cc | 164 ------------------------ lib/fluxsink/a2rfluxsink.cc | 6 +- lib/fluxsink/aufluxsink.cc | 2 +- lib/fluxsink/fl2fluxsink.cc | 2 +- lib/fluxsink/hardwarefluxsink.cc | 2 +- lib/fluxsink/scpfluxsink.cc | 6 +- lib/fluxsink/vcdfluxsink.cc | 2 +- lib/fluxsource/a2rfluxsource.cc | 2 +- lib/fluxsource/catweasel.cc | 2 +- lib/fluxsource/cwffluxsource.cc | 2 +- lib/fluxsource/dmkfluxsource.cc | 2 +- lib/fluxsource/erasefluxsource.cc | 2 +- lib/fluxsource/fl2fluxsource.cc | 4 +- lib/fluxsource/fluxsource.cc | 2 +- lib/fluxsource/flx.cc | 2 +- lib/fluxsource/flxfluxsource.cc | 2 +- lib/fluxsource/hardwarefluxsource.cc | 2 +- lib/fluxsource/kryoflux.cc | 2 +- lib/fluxsource/kryofluxfluxsource.cc | 2 +- lib/fluxsource/memoryfluxsource.cc | 8 +- lib/fluxsource/scpfluxsource.cc | 2 +- lib/fluxsource/testpatternfluxsource.cc | 2 +- lib/imagereader/d64imagereader.cc | 4 +- lib/imagereader/d88imagereader.cc | 4 +- lib/imagereader/dimimagereader.cc | 4 +- lib/imagereader/diskcopyimagereader.cc | 4 +- lib/imagereader/fdiimagereader.cc | 4 +- lib/imagereader/imagereader.cc | 6 +- lib/imagereader/imagereader.h | 2 +- lib/imagereader/imdimagereader.cc | 6 +- lib/imagereader/imgimagereader.cc | 6 +- lib/imagereader/jv3imagereader.cc | 4 +- lib/imagereader/nfdimagereader.cc | 4 +- lib/imagereader/nsiimagereader.cc | 4 +- lib/imagereader/td0imagereader.cc | 4 +- lib/imagewriter/d64imagewriter.cc | 4 +- lib/imagewriter/d88imagewriter.cc | 6 +- lib/imagewriter/diskcopyimagewriter.cc | 4 +- lib/imagewriter/imagewriter.cc | 6 +- lib/imagewriter/imdimagewriter.cc | 6 +- lib/imagewriter/imgimagewriter.cc | 6 +- lib/imagewriter/ldbsimagewriter.cc | 4 +- lib/imagewriter/nsiimagewriter.cc | 4 +- lib/imagewriter/rawimagewriter.cc | 4 +- lib/readerwriter.cc | 8 +- lib/usb/applesauceusb.cc | 2 +- lib/usb/fluxengineusb.cc | 2 +- lib/usb/greaseweazleusb.cc | 2 +- lib/usb/serial.cc | 2 +- lib/usb/usb.cc | 2 +- lib/vfs/amigaffs.cc | 2 +- lib/vfs/fluxsectorinterface.cc | 4 +- lib/vfs/imagesectorinterface.cc | 6 +- lib/vfs/vfs.cc | 6 +- lib/vfs/zdos.cc | 2 +- src/fe-analysedriveresponse.cc | 2 +- src/fe-analyselayout.cc | 6 +- src/fe-format.cc | 4 +- src/fe-getdiskinfo.cc | 4 +- src/fe-getfile.cc | 4 +- src/fe-getfileinfo.cc | 4 +- src/fe-inspect.cc | 8 +- src/fe-ls.cc | 4 +- src/fe-merge.cc | 6 +- src/fe-putfile.cc | 4 +- src/fe-rawread.cc | 4 +- src/fe-rawwrite.cc | 4 +- src/fe-read.cc | 4 +- src/fe-write.cc | 4 +- src/fileutils.cc | 4 +- src/gui/browserpanel.cc | 4 +- src/gui/explorerpanel.cc | 2 +- src/gui/fileviewerwindow.cc | 2 +- src/gui/fluxviewercontrol.cc | 8 +- src/gui/fluxviewerwindow.cc | 6 +- src/gui/histogramviewer.cc | 4 +- src/gui/histogramviewer.h | 5 +- src/gui/idlepanel.cc | 4 +- src/gui/imagerpanel.cc | 4 +- src/gui/mainwindow.cc | 2 +- src/gui/texteditorwindow.cc | 2 +- src/gui/textviewerwindow.cc | 2 +- src/gui/visualisationcontrol.cc | 10 +- tests/cpmfs.cc | 4 +- tests/fluxmapreader.cc | 2 +- tests/fluxpattern.cc | 2 +- tests/flx.cc | 2 +- tests/greaseweazle.cc | 2 +- tests/kryoflux.cc | 2 +- tests/layout.cc | 2 +- tools/upgrade-flux-file.cc | 2 +- 143 files changed, 440 insertions(+), 459 deletions(-) rename lib/{ => core}/logrenderer.cc (94%) rename lib/{ => data}/flux.h (100%) create mode 100644 lib/data/fluxmap.cc rename lib/{ => data}/fluxmap.h (80%) rename lib/{ => data}/image.cc (97%) rename lib/{ => data}/image.h (100%) rename lib/{ => data}/layout.cc (99%) rename lib/{ => data}/layout.h (99%) rename lib/{ => data}/sector.cc (92%) rename lib/{ => data}/sector.h (94%) delete mode 100644 lib/fluxmap.cc diff --git a/arch/aeslanier/decoder.cc b/arch/aeslanier/decoder.cc index 16aceb79..aea844c7 100644 --- a/arch/aeslanier/decoder.cc +++ b/arch/aeslanier/decoder.cc @@ -2,10 +2,10 @@ #include "lib/decoders/decoders.h" #include "aeslanier.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" #include "fmt/format.h" #include diff --git a/arch/agat/decoder.cc b/arch/agat/decoder.cc index 4cd81c75..0af0a9f0 100644 --- a/arch/agat/decoder.cc +++ b/arch/agat/decoder.cc @@ -2,10 +2,10 @@ #include "lib/decoders/decoders.h" #include "agat.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" #include "fmt/format.h" #include diff --git a/arch/agat/encoder.cc b/arch/agat/encoder.cc index cc4d0f6a..b60d591c 100644 --- a/arch/agat/encoder.cc +++ b/arch/agat/encoder.cc @@ -4,8 +4,8 @@ #include "agat.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" -#include "lib/layout.h" +#include "lib/data/image.h" +#include "lib/data/layout.h" #include "arch/agat/agat.pb.h" #include "lib/encoders/encoders.pb.h" diff --git a/arch/amiga/decoder.cc b/arch/amiga/decoder.cc index 8ff1c7d6..b89e1230 100644 --- a/arch/amiga/decoder.cc +++ b/arch/amiga/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "amiga.h" #include "lib/core/bytes.h" #include "fmt/format.h" diff --git a/arch/amiga/encoder.cc b/arch/amiga/encoder.cc index a0fad04e..bec5d82e 100644 --- a/arch/amiga/encoder.cc +++ b/arch/amiga/encoder.cc @@ -4,7 +4,7 @@ #include "amiga.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "arch/amiga/amiga.pb.h" #include "lib/encoders/encoders.pb.h" diff --git a/arch/apple2/decoder.cc b/arch/apple2/decoder.cc index 98804dd4..92d8aeb3 100644 --- a/arch/apple2/decoder.cc +++ b/arch/apple2/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "apple2.h" #include "arch/apple2/apple2.pb.h" #include "lib/decoders/decoders.pb.h" diff --git a/arch/apple2/encoder.cc b/arch/apple2/encoder.cc index 9ee4f455..089f528e 100644 --- a/arch/apple2/encoder.cc +++ b/arch/apple2/encoder.cc @@ -2,9 +2,9 @@ #include "arch/apple2/apple2.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "fmt/format.h" #include "lib/encoders/encoders.pb.h" #include diff --git a/arch/brother/decoder.cc b/arch/brother/decoder.cc index 3e41bf59..0d643f19 100644 --- a/arch/brother/decoder.cc +++ b/arch/brother/decoder.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" #include "brother.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" #include "lib/core/crc.h" #include diff --git a/arch/brother/encoder.cc b/arch/brother/encoder.cc index 3d512f7f..188a27f6 100644 --- a/arch/brother/encoder.cc +++ b/arch/brother/encoder.cc @@ -4,7 +4,7 @@ #include "brother.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "arch/brother/brother.pb.h" #include "lib/encoders/encoders.pb.h" diff --git a/arch/c64/decoder.cc b/arch/c64/decoder.cc index ac34f29c..47d300f2 100644 --- a/arch/c64/decoder.cc +++ b/arch/c64/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "c64.h" #include "lib/core/crc.h" #include "lib/core/bytes.h" diff --git a/arch/c64/encoder.cc b/arch/c64/encoder.cc index 4dce3e09..ae0c0469 100644 --- a/arch/c64/encoder.cc +++ b/arch/c64/encoder.cc @@ -3,13 +3,13 @@ #include "lib/encoders/encoders.h" #include "c64.h" #include "lib/core/crc.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "fmt/format.h" #include "arch/c64/c64.pb.h" #include "lib/encoders/encoders.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include #include "lib/core/bytes.h" diff --git a/arch/f85/decoder.cc b/arch/f85/decoder.cc index 1232cb5e..4ef2a7b8 100644 --- a/arch/f85/decoder.cc +++ b/arch/f85/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "f85.h" #include "lib/core/crc.h" #include "lib/core/bytes.h" diff --git a/arch/fb100/decoder.cc b/arch/fb100/decoder.cc index 83e5c1b9..35e74726 100644 --- a/arch/fb100/decoder.cc +++ b/arch/fb100/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "fb100.h" #include "lib/core/crc.h" #include "lib/core/bytes.h" diff --git a/arch/ibm/decoder.cc b/arch/ibm/decoder.cc index bd71cc41..9be98fff 100644 --- a/arch/ibm/decoder.cc +++ b/arch/ibm/decoder.cc @@ -2,13 +2,13 @@ #include "lib/decoders/decoders.h" #include "ibm.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "arch/ibm/ibm.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include static_assert(std::is_trivially_copyable::value, diff --git a/arch/ibm/encoder.cc b/arch/ibm/encoder.cc index 4215b32a..2ad9c644 100644 --- a/arch/ibm/encoder.cc +++ b/arch/ibm/encoder.cc @@ -5,12 +5,12 @@ #include "ibm.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "arch/ibm/ibm.pb.h" #include "lib/encoders/encoders.pb.h" #include "fmt/format.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include /* IAM record separator: diff --git a/arch/macintosh/decoder.cc b/arch/macintosh/decoder.cc index 9e6bee61..5616cf0d 100644 --- a/arch/macintosh/decoder.cc +++ b/arch/macintosh/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "macintosh.h" #include "lib/core/bytes.h" #include "fmt/format.h" diff --git a/arch/macintosh/encoder.cc b/arch/macintosh/encoder.cc index 65610c86..50b6e6b7 100644 --- a/arch/macintosh/encoder.cc +++ b/arch/macintosh/encoder.cc @@ -4,10 +4,10 @@ #include "macintosh.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "fmt/format.h" #include "lib/encoders/encoders.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "arch/macintosh/macintosh.pb.h" #include diff --git a/arch/micropolis/decoder.cc b/arch/micropolis/decoder.cc index 63ae43cb..648c46cb 100644 --- a/arch/micropolis/decoder.cc +++ b/arch/micropolis/decoder.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "micropolis.h" #include "lib/core/bytes.h" #include "fmt/format.h" diff --git a/arch/micropolis/encoder.cc b/arch/micropolis/encoder.cc index 16fc4f8d..da32ef4c 100644 --- a/arch/micropolis/encoder.cc +++ b/arch/micropolis/encoder.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "micropolis.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/encoders/encoders.pb.h" static void write_sector(std::vector& bits, diff --git a/arch/mx/decoder.cc b/arch/mx/decoder.cc index a7758a18..b7589235 100644 --- a/arch/mx/decoder.cc +++ b/arch/mx/decoder.cc @@ -2,10 +2,10 @@ #include "lib/decoders/decoders.h" #include "arch/mx/mx.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include const int SECTOR_SIZE = 256; diff --git a/arch/northstar/decoder.cc b/arch/northstar/decoder.cc index 4c5420d8..67ecad62 100644 --- a/arch/northstar/decoder.cc +++ b/arch/northstar/decoder.cc @@ -12,11 +12,11 @@ */ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "northstar.h" #include "lib/core/bytes.h" #include "lib/decoders/decoders.pb.h" diff --git a/arch/northstar/encoder.cc b/arch/northstar/encoder.cc index 86709e4f..214c0f3d 100644 --- a/arch/northstar/encoder.cc +++ b/arch/northstar/encoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "northstar.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/encoders/encoders.pb.h" #define GAP_FILL_SIZE_SD 30 diff --git a/arch/rolandd20/decoder.cc b/arch/rolandd20/decoder.cc index 629d9b24..7351f5cf 100644 --- a/arch/rolandd20/decoder.cc +++ b/arch/rolandd20/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "lib/decoders/decoders.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" #include "rolandd20.h" #include diff --git a/arch/smaky6/decoder.cc b/arch/smaky6/decoder.cc index d2496c39..ed1a1cdc 100644 --- a/arch/smaky6/decoder.cc +++ b/arch/smaky6/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "smaky6.h" #include "lib/core/bytes.h" #include "lib/core/crc.h" diff --git a/arch/tartu/decoder.cc b/arch/tartu/decoder.cc index a3403c27..623a6654 100644 --- a/arch/tartu/decoder.cc +++ b/arch/tartu/decoder.cc @@ -3,22 +3,19 @@ #include "lib/decoders/decoders.h" #include "arch/tartu/tartu.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include constexpr uint64_t HEADER_BITS = 0xaaaaaaaa44895554LL; -constexpr uint64_t DATA_BITS = 0xaaaaaaaa44895545LL; +constexpr uint64_t DATA_BITS = 0xaaaaaaaa44895545LL; static const FluxPattern HEADER_PATTERN(64, HEADER_BITS); static const FluxPattern DATA_PATTERN(64, DATA_BITS); -const FluxMatchers ANY_RECORD_PATTERN { - &HEADER_PATTERN, - &DATA_PATTERN -}; +const FluxMatchers ANY_RECORD_PATTERN{&HEADER_PATTERN, &DATA_PATTERN}; class TartuDecoder : public Decoder { @@ -29,9 +26,7 @@ public: { } - void beginTrack() override - { - } + void beginTrack() override {} nanoseconds_t advanceToNextRecord() override { @@ -45,7 +40,7 @@ public: auto bits = readRawBits(16 * 4); auto bytes = decodeFmMfm(bits).slice(0, 4); - + ByteReader br(bytes); uint8_t track = br.read_8(); _sector->logicalTrack = track >> 1; @@ -54,7 +49,7 @@ public: _sector->logicalSector = br.read_8(); uint8_t wantChecksum = br.read_8(); uint8_t gotChecksum = ~sumBytes(bytes.slice(0, 3)); - + if (wantChecksum == gotChecksum) _sector->status = Sector::DATA_MISSING; @@ -65,14 +60,15 @@ public: { if (readRaw64() != DATA_BITS) return; - + const auto& bits = readRawBits(129 * 16); const auto& bytes = decodeFmMfm(bits).slice(0, 129); _sector->data = bytes.slice(0, 128); uint8_t wantChecksum = bytes.reader().seek(128).read_8(); uint8_t gotChecksum = ~sumBytes(_sector->data); - _sector->status = (wantChecksum == gotChecksum) ? Sector::OK : Sector::BAD_CHECKSUM; + _sector->status = + (wantChecksum == gotChecksum) ? Sector::OK : Sector::BAD_CHECKSUM; } private: @@ -83,4 +79,3 @@ std::unique_ptr createTartuDecoder(const DecoderProto& config) { return std::unique_ptr(new TartuDecoder(config)); } - diff --git a/arch/tartu/encoder.cc b/arch/tartu/encoder.cc index dd49fbf9..5502a531 100644 --- a/arch/tartu/encoder.cc +++ b/arch/tartu/encoder.cc @@ -4,8 +4,8 @@ #include "lib/encoders/encoders.h" #include "arch/tartu/tartu.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include class TartuEncoder : public Encoder diff --git a/arch/tids990/decoder.cc b/arch/tids990/decoder.cc index 9a308c38..0084803f 100644 --- a/arch/tids990/decoder.cc +++ b/arch/tids990/decoder.cc @@ -3,10 +3,10 @@ #include "lib/encoders/encoders.h" #include "arch/tids990/tids990.h" #include "lib/core/crc.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include #include "fmt/format.h" diff --git a/arch/tids990/encoder.cc b/arch/tids990/encoder.cc index f7d88392..f87d2b8b 100644 --- a/arch/tids990/encoder.cc +++ b/arch/tids990/encoder.cc @@ -4,7 +4,7 @@ #include "tids990.h" #include "lib/core/crc.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "arch/tids990/tids990.pb.h" #include "lib/encoders/encoders.pb.h" #include "fmt/format.h" diff --git a/arch/victor9k/decoder.cc b/arch/victor9k/decoder.cc index e8fecf64..24a4a91f 100644 --- a/arch/victor9k/decoder.cc +++ b/arch/victor9k/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "victor9k.h" #include "lib/core/crc.h" #include "lib/core/bytes.h" diff --git a/arch/victor9k/encoder.cc b/arch/victor9k/encoder.cc index 13b27c30..e5387ac3 100644 --- a/arch/victor9k/encoder.cc +++ b/arch/victor9k/encoder.cc @@ -3,13 +3,13 @@ #include "lib/encoders/encoders.h" #include "victor9k.h" #include "lib/core/crc.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/readerwriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "fmt/format.h" #include "arch/victor9k/victor9k.pb.h" #include "lib/encoders/encoders.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include #include "lib/core/bytes.h" diff --git a/arch/zilogmcz/decoder.cc b/arch/zilogmcz/decoder.cc index 1e315cd4..71f0777a 100644 --- a/arch/zilogmcz/decoder.cc +++ b/arch/zilogmcz/decoder.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "protocol.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "zilogmcz.h" #include "lib/core/bytes.h" #include "lib/core/crc.h" diff --git a/build.py b/build.py index f492b2cf..6aeb5c1e 100644 --- a/build.py +++ b/build.py @@ -26,13 +26,12 @@ cxxlibrary( name="lib", srcs=[ "./lib/decoders/decoders.cc", + "./lib/fl2.cc", "./lib/decoders/fluxdecoder.cc", "./lib/decoders/fluxmapreader.cc", "./lib/decoders/fluxpattern.cc", "./lib/decoders/fmmfm.cc", "./lib/encoders/encoders.cc", - "./lib/fl2.cc", - "./lib/fluxmap.cc", "./lib/fluxsink/a2rfluxsink.cc", "./lib/fluxsink/aufluxsink.cc", "./lib/fluxsink/fl2fluxsink.cc", @@ -56,7 +55,6 @@ cxxlibrary( "./lib/fluxsource/scpfluxsource.cc", "./lib/fluxsource/testpatternfluxsource.cc", "./lib/globals.cc", - "./lib/image.cc", "./lib/imagereader/d64imagereader.cc", "./lib/imagereader/d88imagereader.cc", "./lib/imagereader/dimimagereader.cc", @@ -78,11 +76,8 @@ cxxlibrary( "./lib/imagewriter/ldbsimagewriter.cc", "./lib/imagewriter/nsiimagewriter.cc", "./lib/imagewriter/rawimagewriter.cc", - "./lib/layout.cc", "./lib/ldbs.cc", - "./lib/logrenderer.cc", "./lib/readerwriter.cc", - "./lib/sector.cc", "./lib/usb/applesauceusb.cc", "./lib/usb/fluxengineusb.cc", "./lib/usb/greaseweazle.cc", @@ -161,21 +156,16 @@ cxxlibrary( "lib/encoders/encoders.h": "./lib/encoders/encoders.h", "lib/scp.h": "./lib/scp.h", "lib/fl2.h": "./lib/fl2.h", - "lib/flux.h": "./lib/flux.h", - "lib/fluxmap.h": "./lib/fluxmap.h", "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h", "lib/fluxsource/catweasel.h": "lib/fluxsource/catweasel.h", "lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h", "lib/fluxsource/flx.h": "lib/fluxsource/flx.h", "lib/fluxsource/kryoflux.h": "lib/fluxsource/kryoflux.h", "lib/globals.h": "./lib/globals.h", - "lib/image.h": "./lib/image.h", "lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h", "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h", - "lib/layout.h": "./lib/layout.h", "lib/ldbs.h": "./lib/ldbs.h", "lib/readerwriter.h": "./lib/readerwriter.h", - "lib/sector.h": "./lib/sector.h", "lib/usb/applesauce.h": "./lib/usb/applesauce.h", "lib/usb/greaseweazle.h": "./lib/usb/greaseweazle.h", "lib/usb/usb.h": "./lib/usb/usb.h", @@ -192,6 +182,7 @@ cxxlibrary( "dep/stb", "lib/core", "lib/config", + "lib/data", "lib/fluxsource+proto_lib", ], ) diff --git a/lib/core/build.py b/lib/core/build.py index ce34f3a4..0b0cd992 100644 --- a/lib/core/build.py +++ b/lib/core/build.py @@ -10,6 +10,7 @@ cxxlibrary( "./hexdump.cc", "./utils.cc", "./logger.cc", + "./logrenderer.cc", ], hdrs={ "lib/core/bitmap.h": "./bitmap.h", diff --git a/lib/logrenderer.cc b/lib/core/logrenderer.cc similarity index 94% rename from lib/logrenderer.cc rename to lib/core/logrenderer.cc index 5662931c..4296d985 100644 --- a/lib/logrenderer.cc +++ b/lib/core/logrenderer.cc @@ -1,8 +1,5 @@ #include "lib/core/globals.h" #include "lib/core/bytes.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" -#include "lib/flux.h" #include "lib/core/logger.h" namespace diff --git a/lib/flux.h b/lib/data/flux.h similarity index 100% rename from lib/flux.h rename to lib/data/flux.h diff --git a/lib/data/fluxmap.cc b/lib/data/fluxmap.cc new file mode 100644 index 00000000..5c12c02a --- /dev/null +++ b/lib/data/fluxmap.cc @@ -0,0 +1,77 @@ +#include "lib/core/globals.h" +#include "lib/data/fluxmap.h" +#include "protocol.h" + +Fluxmap& Fluxmap::appendBytes(const Bytes& bytes) +{ + if (bytes.size() == 0) + return *this; + + return appendBytes(&bytes[0], bytes.size()); +} + +Fluxmap& Fluxmap::appendBytes(const uint8_t* ptr, size_t len) +{ + ByteWriter bw(_bytes); + bw.seekToEnd(); + + while (len--) + { + uint8_t byte = *ptr++; + _ticks += byte & 0x3f; + bw.write_8(byte); + } + + _duration = _ticks * NS_PER_TICK; + return *this; +} + +uint8_t& Fluxmap::findLastByte() +{ + if (_bytes.empty()) + appendByte(0x00); + return *(_bytes.end() - 1); +} + +Fluxmap& Fluxmap::appendInterval(uint32_t ticks) +{ + while (ticks >= 0x3f) + { + appendByte(0x3f); + ticks -= 0x3f; + } + appendByte((uint8_t)ticks); + return *this; +} + +Fluxmap& Fluxmap::appendPulse() +{ + findLastByte() |= 0x80; + return *this; +} + +Fluxmap& Fluxmap::appendIndex() +{ + findLastByte() |= 0x40; + return *this; +} + +Fluxmap& Fluxmap::appendDesync() +{ + appendByte(F_DESYNC); + return *this; +} + +std::vector> Fluxmap::split() const +{ + std::vector> maps; + auto bytesVector = rawBytes().split(F_DESYNC); + + for (auto bytes : bytesVector) + { + if (bytes.size() != 0) + maps.push_back(std::move(std::make_unique(bytes))); + } + + return maps; +} diff --git a/lib/fluxmap.h b/lib/data/fluxmap.h similarity index 80% rename from lib/fluxmap.h rename to lib/data/fluxmap.h index a412aa71..52322007 100644 --- a/lib/fluxmap.h +++ b/lib/data/fluxmap.h @@ -83,19 +83,6 @@ public: int threshold_ticks, int amount_ticks); std::vector> split() const; - struct ClockData - { - nanoseconds_t median; - uint32_t noiseFloor; - uint32_t signalLevel; - nanoseconds_t peakStart; - nanoseconds_t peakEnd; - uint32_t buckets[256]; - }; - - ClockData guessClock( - double noiseFloorFactor = 0.01, double signalLevelFactor = 0.05) const; - private: uint8_t& findLastByte(); diff --git a/lib/image.cc b/lib/data/image.cc similarity index 97% rename from lib/image.cc rename to lib/data/image.cc index 4fed5349..9de32250 100644 --- a/lib/image.cc +++ b/lib/data/image.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" -#include "lib/sector.h" -#include "lib/image.h" -#include "lib/layout.h" +#include "lib/data/sector.h" +#include "lib/data/image.h" +#include "lib/data/layout.h" Image::Image() {} diff --git a/lib/image.h b/lib/data/image.h similarity index 100% rename from lib/image.h rename to lib/data/image.h diff --git a/lib/layout.cc b/lib/data/layout.cc similarity index 99% rename from lib/layout.cc rename to lib/data/layout.cc index b099632d..89bec9ed 100644 --- a/lib/layout.cc +++ b/lib/data/layout.cc @@ -1,9 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/config/proto.h" #include "lib/core/logger.h" -#include "lib/fl2.h" static unsigned getTrackStep() { diff --git a/lib/layout.h b/lib/data/layout.h similarity index 99% rename from lib/layout.h rename to lib/data/layout.h index f886150c..34447139 100644 --- a/lib/layout.h +++ b/lib/data/layout.h @@ -1,7 +1,7 @@ #ifndef LAYOUT_H #define LAYOUT_H -#include "lib/flux.h" +#include "lib/data/flux.h" class SectorListProto; class TrackInfo; diff --git a/lib/sector.cc b/lib/data/sector.cc similarity index 92% rename from lib/sector.cc rename to lib/data/sector.cc index 90a4cdbc..1f4ab5ab 100644 --- a/lib/sector.cc +++ b/lib/data/sector.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" -#include "lib/flux.h" -#include "lib/sector.h" -#include "lib/layout.h" +#include "lib/data/flux.h" +#include "lib/data/sector.h" +#include "lib/data/layout.h" Sector::Sector(const LogicalLocation& location): LogicalLocation(location), diff --git a/lib/sector.h b/lib/data/sector.h similarity index 94% rename from lib/sector.h rename to lib/data/sector.h index 465bccfa..8a4a925a 100644 --- a/lib/sector.h +++ b/lib/data/sector.h @@ -2,7 +2,7 @@ #define SECTOR_H #include "lib/core/bytes.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" class Record; class TrackInfo; diff --git a/lib/decoders/decoders.cc b/lib/decoders/decoders.cc index f94061e6..9b2e07e0 100644 --- a/lib/decoders/decoders.cc +++ b/lib/decoders/decoders.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/config/config.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" @@ -24,13 +24,13 @@ #include "arch/victor9k/victor9k.h" #include "arch/zilogmcz/zilogmcz.h" #include "lib/decoders/fluxmapreader.h" -#include "lib/flux.h" +#include "lib/data/flux.h" #include "protocol.h" #include "lib/decoders/rawbits.h" -#include "lib/sector.h" -#include "lib/image.h" +#include "lib/data/sector.h" +#include "lib/data/image.h" #include "lib/decoders/decoders.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include std::unique_ptr Decoder::create(Config& config) diff --git a/lib/decoders/decoders.h b/lib/decoders/decoders.h index 18cfff90..9ba91949 100644 --- a/lib/decoders/decoders.h +++ b/lib/decoders/decoders.h @@ -2,7 +2,7 @@ #define DECODERS_H #include "lib/core/bytes.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxdecoder.h" @@ -14,7 +14,7 @@ class RawBits; class DecoderProto; class Config; -#include "lib/flux.h" +#include "lib/data/flux.h" extern void setDecoderManualClockRate(double clockrate_us); diff --git a/lib/decoders/fluxdecoder.cc b/lib/decoders/fluxdecoder.cc index 4afe8d01..525e7709 100644 --- a/lib/decoders/fluxdecoder.cc +++ b/lib/decoders/fluxdecoder.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxdecoder.h" #include "lib/decoders/decoders.pb.h" diff --git a/lib/decoders/fluxmapreader.cc b/lib/decoders/fluxmapreader.cc index eb3dcc4b..55e45ed8 100644 --- a/lib/decoders/fluxmapreader.cc +++ b/lib/decoders/fluxmapreader.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxpattern.h" #include "lib/config/proto.h" @@ -166,3 +166,87 @@ void FluxmapReader::seekToIndexMark() skipToEvent(F_BIT_INDEX); _pos.zeroes = 0; } + +/* + * Tries to guess the clock by finding the smallest common interval. + * Returns nanoseconds. + */ +FluxmapReader::ClockData FluxmapReader::guessClock( + double noiseFloorFactor, double signalLevelFactor) +{ + ClockData data = {}; + + while (!eof()) + { + unsigned interval; + findEvent(F_BIT_PULSE, interval); + if (interval > 0xff) + continue; + data.buckets[interval]++; + } + + uint32_t max = + *std::max_element(std::begin(data.buckets), std::end(data.buckets)); + uint32_t min = + *std::min_element(std::begin(data.buckets), std::end(data.buckets)); + data.noiseFloor = min + (max - min) * noiseFloorFactor; + data.signalLevel = min + (max - min) * signalLevelFactor; + + /* Find a point solidly within the first pulse. */ + + int pulseindex = 0; + while (pulseindex < 256) + { + if (data.buckets[pulseindex] > data.signalLevel) + break; + pulseindex++; + } + if (pulseindex == -1) + return data; + + /* Find the upper and lower bounds of the pulse. */ + + int peaklo = pulseindex; + while (peaklo > 0) + { + if (data.buckets[peaklo] < data.noiseFloor) + break; + peaklo--; + } + + int peakhi = pulseindex; + while (peakhi < 255) + { + if (data.buckets[peakhi] < data.noiseFloor) + break; + peakhi++; + } + + /* Find the total accumulated size of the pulse. */ + + uint32_t total_size = 0; + for (int i = peaklo; i < peakhi; i++) + total_size += data.buckets[i]; + + /* Now find the median. */ + + uint32_t count = 0; + int median = peaklo; + while (median < peakhi) + { + count += data.buckets[median]; + if (count > (total_size / 2)) + break; + median++; + } + + /* + * Okay, the median should now be a good candidate for the (or a) clock. + * How this maps onto the actual clock rate depends on the encoding. + */ + + data.peakStart = peaklo * NS_PER_TICK; + data.peakEnd = peakhi * NS_PER_TICK; + data.median = median * NS_PER_TICK; + return data; +} diff --git a/lib/decoders/fluxmapreader.h b/lib/decoders/fluxmapreader.h index 13e5ef43..29a73062 100644 --- a/lib/decoders/fluxmapreader.h +++ b/lib/decoders/fluxmapreader.h @@ -1,7 +1,7 @@ #ifndef FLUXMAPREADER_H #define FLUXMAPREADER_H -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/config/flags.h" #include "protocol.h" @@ -56,6 +56,19 @@ public: nanoseconds_t seekToPattern( const FluxMatcher& pattern, const FluxMatcher*& matching); + struct ClockData + { + nanoseconds_t median; + uint32_t noiseFloor; + uint32_t signalLevel; + nanoseconds_t peakStart; + nanoseconds_t peakEnd; + uint32_t buckets[256]; + }; + + ClockData guessClock( + double noiseFloorFactor = 0.01, double signalLevelFactor = 0.05); + private: const Fluxmap& _fluxmap; const uint8_t* _bytes; diff --git a/lib/decoders/fluxpattern.cc b/lib/decoders/fluxpattern.cc index 7facf0b0..6cf543ce 100644 --- a/lib/decoders/fluxpattern.cc +++ b/lib/decoders/fluxpattern.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxpattern.h" #include "lib/config/proto.h" #include "protocol.h" diff --git a/lib/decoders/fluxpattern.h b/lib/decoders/fluxpattern.h index c98c5424..3ca2a992 100644 --- a/lib/decoders/fluxpattern.h +++ b/lib/decoders/fluxpattern.h @@ -1,7 +1,7 @@ #pragma once #include "lib/core/utils.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/config/flags.h" #include "protocol.h" diff --git a/lib/encoders/encoders.cc b/lib/encoders/encoders.cc index ca5e73cb..bcb93afa 100644 --- a/lib/encoders/encoders.cc +++ b/lib/encoders/encoders.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" #include "arch/agat/agat.h" @@ -17,8 +17,8 @@ #include "arch/victor9k/victor9k.h" #include "lib/encoders/encoders.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" -#include "lib/image.h" +#include "lib/data/layout.h" +#include "lib/data/image.h" #include "protocol.h" std::unique_ptr Encoder::create(Config& config) diff --git a/lib/fl2.cc b/lib/fl2.cc index f3c0ed14..a167df30 100644 --- a/lib/fl2.cc +++ b/lib/fl2.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/proto.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fl2.pb.h" #include diff --git a/lib/fluxmap.cc b/lib/fluxmap.cc deleted file mode 100644 index a25d3ef7..00000000 --- a/lib/fluxmap.cc +++ /dev/null @@ -1,164 +0,0 @@ -#include "lib/core/globals.h" -#include "lib/fluxmap.h" -#include "lib/decoders/fluxmapreader.h" -#include "protocol.h" - -Fluxmap& Fluxmap::appendBytes(const Bytes& bytes) -{ - if (bytes.size() == 0) - return *this; - - return appendBytes(&bytes[0], bytes.size()); -} - -Fluxmap& Fluxmap::appendBytes(const uint8_t* ptr, size_t len) -{ - ByteWriter bw(_bytes); - bw.seekToEnd(); - - while (len--) - { - uint8_t byte = *ptr++; - _ticks += byte & 0x3f; - bw.write_8(byte); - } - - _duration = _ticks * NS_PER_TICK; - return *this; -} - -uint8_t& Fluxmap::findLastByte() -{ - if (_bytes.empty()) - appendByte(0x00); - return *(_bytes.end() - 1); -} - -Fluxmap& Fluxmap::appendInterval(uint32_t ticks) -{ - while (ticks >= 0x3f) - { - appendByte(0x3f); - ticks -= 0x3f; - } - appendByte((uint8_t)ticks); - return *this; -} - -Fluxmap& Fluxmap::appendPulse() -{ - findLastByte() |= 0x80; - return *this; -} - -Fluxmap& Fluxmap::appendIndex() -{ - findLastByte() |= 0x40; - return *this; -} - -Fluxmap& Fluxmap::appendDesync() -{ - appendByte(F_DESYNC); - return *this; -} - -std::vector> Fluxmap::split() const -{ - std::vector> maps; - auto bytesVector = rawBytes().split(F_DESYNC); - - for (auto bytes : bytesVector) - { - if (bytes.size() != 0) - maps.push_back(std::move(std::make_unique(bytes))); - } - - return maps; -} - -/* - * Tries to guess the clock by finding the smallest common interval. - * Returns nanoseconds. - */ -Fluxmap::ClockData Fluxmap::guessClock( - double noiseFloorFactor, double signalLevelFactor) const -{ - ClockData data = {}; - - FluxmapReader fr(*this); - - while (!fr.eof()) - { - unsigned interval; - fr.findEvent(F_BIT_PULSE, interval); - if (interval > 0xff) - continue; - data.buckets[interval]++; - } - - uint32_t max = - *std::max_element(std::begin(data.buckets), std::end(data.buckets)); - uint32_t min = - *std::min_element(std::begin(data.buckets), std::end(data.buckets)); - data.noiseFloor = min + (max - min) * noiseFloorFactor; - data.signalLevel = min + (max - min) * signalLevelFactor; - - /* Find a point solidly within the first pulse. */ - - int pulseindex = 0; - while (pulseindex < 256) - { - if (data.buckets[pulseindex] > data.signalLevel) - break; - pulseindex++; - } - if (pulseindex == -1) - return data; - - /* Find the upper and lower bounds of the pulse. */ - - int peaklo = pulseindex; - while (peaklo > 0) - { - if (data.buckets[peaklo] < data.noiseFloor) - break; - peaklo--; - } - - int peakhi = pulseindex; - while (peakhi < 255) - { - if (data.buckets[peakhi] < data.noiseFloor) - break; - peakhi++; - } - - /* Find the total accumulated size of the pulse. */ - - uint32_t total_size = 0; - for (int i = peaklo; i < peakhi; i++) - total_size += data.buckets[i]; - - /* Now find the median. */ - - uint32_t count = 0; - int median = peaklo; - while (median < peakhi) - { - count += data.buckets[median]; - if (count > (total_size / 2)) - break; - median++; - } - - /* - * Okay, the median should now be a good candidate for the (or a) clock. - * How this maps onto the actual clock rate depends on the encoding. - */ - - data.peakStart = peaklo * NS_PER_TICK; - data.peakEnd = peakhi * NS_PER_TICK; - data.median = median * NS_PER_TICK; - return data; -} diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc index 6ce328be..4c821687 100644 --- a/lib/fluxsink/a2rfluxsink.cc +++ b/lib/fluxsink/a2rfluxsink.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "protocol.h" #include "lib/fluxsink/fluxsink.h" @@ -8,8 +8,8 @@ #include "lib/fluxsink/fluxsink.pb.h" #include "lib/core/logger.h" #include "lib/config/proto.h" -#include "lib/fluxmap.h" -#include "lib/layout.h" +#include "lib/data/fluxmap.h" +#include "lib/data/layout.h" #include "lib/a2r.h" #include #include diff --git a/lib/fluxsink/aufluxsink.cc b/lib/fluxsink/aufluxsink.cc index 688b5a9a..682759ef 100644 --- a/lib/fluxsink/aufluxsink.cc +++ b/lib/fluxsink/aufluxsink.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "protocol.h" #include "lib/fluxsink/fluxsink.h" diff --git a/lib/fluxsink/fl2fluxsink.cc b/lib/fluxsink/fl2fluxsink.cc index 06aba3f2..b43da58f 100644 --- a/lib/fluxsink/fl2fluxsink.cc +++ b/lib/fluxsink/fl2fluxsink.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "protocol.h" #include "lib/fluxsink/fluxsink.h" diff --git a/lib/fluxsink/hardwarefluxsink.cc b/lib/fluxsink/hardwarefluxsink.cc index 65916398..7966ac9c 100644 --- a/lib/fluxsink/hardwarefluxsink.cc +++ b/lib/fluxsink/hardwarefluxsink.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/logger.h" #include "lib/config/proto.h" #include "lib/usb/usb.h" diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc index 42a5a87a..68a2be94 100644 --- a/lib/fluxsink/scpfluxsink.cc +++ b/lib/fluxsink/scpfluxsink.cc @@ -1,15 +1,15 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "protocol.h" #include "lib/fluxsink/fluxsink.h" #include "lib/decoders/fluxmapreader.h" #include "lib/fluxsink/fluxsink.pb.h" #include "lib/config/proto.h" -#include "lib/fluxmap.h" -#include "lib/layout.h" +#include "lib/data/fluxmap.h" +#include "lib/data/layout.h" #include "lib/scp.h" #include "lib/core/logger.h" #include diff --git a/lib/fluxsink/vcdfluxsink.cc b/lib/fluxsink/vcdfluxsink.cc index 1ef830eb..f9770d04 100644 --- a/lib/fluxsink/vcdfluxsink.cc +++ b/lib/fluxsink/vcdfluxsink.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "protocol.h" #include "lib/fluxsink/fluxsink.h" diff --git a/lib/fluxsource/a2rfluxsource.cc b/lib/fluxsource/a2rfluxsource.cc index f0b1a62b..9e8bf8b0 100644 --- a/lib/fluxsource/a2rfluxsource.cc +++ b/lib/fluxsource/a2rfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/config/proto.h" diff --git a/lib/fluxsource/catweasel.cc b/lib/fluxsource/catweasel.cc index 79b73cf0..0210d543 100644 --- a/lib/fluxsource/catweasel.cc +++ b/lib/fluxsource/catweasel.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "lib/fluxsource/catweasel.h" diff --git a/lib/fluxsource/cwffluxsource.cc b/lib/fluxsource/cwffluxsource.cc index 017d3c8f..53d9f28a 100644 --- a/lib/fluxsource/cwffluxsource.cc +++ b/lib/fluxsource/cwffluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/catweasel.h" diff --git a/lib/fluxsource/dmkfluxsource.cc b/lib/fluxsource/dmkfluxsource.cc index 2518d9d8..4771b372 100644 --- a/lib/fluxsource/dmkfluxsource.cc +++ b/lib/fluxsource/dmkfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/catweasel.h" diff --git a/lib/fluxsource/erasefluxsource.cc b/lib/fluxsource/erasefluxsource.cc index 5fde0a24..2fcc8515 100644 --- a/lib/fluxsource/erasefluxsource.cc +++ b/lib/fluxsource/erasefluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.pb.h" diff --git a/lib/fluxsource/fl2fluxsource.cc b/lib/fluxsource/fl2fluxsource.cc index 6ba05b44..521e236d 100644 --- a/lib/fluxsource/fl2fluxsource.cc +++ b/lib/fluxsource/fl2fluxsource.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fl2.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/config/proto.h" #include "lib/fl2.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include class Fl2FluxSourceIterator : public FluxSourceIterator diff --git a/lib/fluxsource/fluxsource.cc b/lib/fluxsource/fluxsource.cc index 4fe8d9fd..67a253c4 100644 --- a/lib/fluxsource/fluxsource.cc +++ b/lib/fluxsource/fluxsource.cc @@ -2,7 +2,7 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/config/config.pb.h" #include "lib/config/proto.h" #include "lib/core/utils.h" diff --git a/lib/fluxsource/flx.cc b/lib/fluxsource/flx.cc index 3012567f..110112d5 100644 --- a/lib/fluxsource/flx.cc +++ b/lib/fluxsource/flx.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "kryoflux.h" #include "protocol.h" #include "lib/fluxsource/flx.h" diff --git a/lib/fluxsource/flxfluxsource.cc b/lib/fluxsource/flxfluxsource.cc index 9b6491e9..3c15e7bf 100644 --- a/lib/fluxsource/flxfluxsource.cc +++ b/lib/fluxsource/flxfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/flx.h" diff --git a/lib/fluxsource/hardwarefluxsource.cc b/lib/fluxsource/hardwarefluxsource.cc index b998533a..99af5b8d 100644 --- a/lib/fluxsource/hardwarefluxsource.cc +++ b/lib/fluxsource/hardwarefluxsource.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/logger.h" #include "lib/config/proto.h" #include "lib/usb/usb.h" diff --git a/lib/fluxsource/kryoflux.cc b/lib/fluxsource/kryoflux.cc index 440c605c..0128de9d 100644 --- a/lib/fluxsource/kryoflux.cc +++ b/lib/fluxsource/kryoflux.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "kryoflux.h" #include "protocol.h" #include diff --git a/lib/fluxsource/kryofluxfluxsource.cc b/lib/fluxsource/kryofluxfluxsource.cc index c5c20706..29633ce8 100644 --- a/lib/fluxsource/kryofluxfluxsource.cc +++ b/lib/fluxsource/kryofluxfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "kryoflux.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" diff --git a/lib/fluxsource/memoryfluxsource.cc b/lib/fluxsource/memoryfluxsource.cc index 5002f907..58aac684 100644 --- a/lib/fluxsource/memoryfluxsource.cc +++ b/lib/fluxsource/memoryfluxsource.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" -#include "lib/flux.h" +#include "lib/data/fluxmap.h" +#include "lib/data/flux.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/fluxmap.h" -#include "lib/layout.h" +#include "lib/data/fluxmap.h" +#include "lib/data/layout.h" #include class MemoryFluxSourceIterator : public FluxSourceIterator diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc index a835337c..de4dd02f 100644 --- a/lib/fluxsource/scpfluxsource.cc +++ b/lib/fluxsource/scpfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "kryoflux.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/core/utils.h" diff --git a/lib/fluxsource/testpatternfluxsource.cc b/lib/fluxsource/testpatternfluxsource.cc index 0431092f..b9a0f71a 100644 --- a/lib/fluxsource/testpatternfluxsource.cc +++ b/lib/fluxsource/testpatternfluxsource.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.pb.h" diff --git a/lib/imagereader/d64imagereader.cc b/lib/imagereader/d64imagereader.cc index efe2f71e..9bff491b 100644 --- a/lib/imagereader/d64imagereader.cc +++ b/lib/imagereader/d64imagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/proto.h" #include diff --git a/lib/imagereader/d88imagereader.cc b/lib/imagereader/d88imagereader.cc index ebce7a1d..9d568203 100644 --- a/lib/imagereader/d88imagereader.cc +++ b/lib/imagereader/d88imagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagereader/dimimagereader.cc b/lib/imagereader/dimimagereader.cc index c2ba6a26..4fefc105 100644 --- a/lib/imagereader/dimimagereader.cc +++ b/lib/imagereader/dimimagereader.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/proto.h" #include "lib/config/config.pb.h" diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc index fdd69335..d0f0fc1b 100644 --- a/lib/imagereader/diskcopyimagereader.cc +++ b/lib/imagereader/diskcopyimagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include diff --git a/lib/imagereader/fdiimagereader.cc b/lib/imagereader/fdiimagereader.cc index b2529f80..82b0a74a 100644 --- a/lib/imagereader/fdiimagereader.cc +++ b/lib/imagereader/fdiimagereader.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagereader/imagereader.cc b/lib/imagereader/imagereader.cc index b0240769..73cd95d7 100644 --- a/lib/imagereader/imagereader.cc +++ b/lib/imagereader/imagereader.cc @@ -1,12 +1,12 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/core/utils.h" #include "lib/config/proto.h" -#include "lib/image.h" -#include "lib/layout.h" +#include "lib/data/image.h" +#include "lib/data/layout.h" #include "lib/config/config.pb.h" #include "lib/core/logger.h" #include diff --git a/lib/imagereader/imagereader.h b/lib/imagereader/imagereader.h index 42ba489b..c4855919 100644 --- a/lib/imagereader/imagereader.h +++ b/lib/imagereader/imagereader.h @@ -1,7 +1,7 @@ #ifndef IMAGEREADER_H #define IMAGEREADER_H -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/config.pb.h" class ImageSpec; diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc index 58efd031..7875837f 100644 --- a/lib/imagereader/imdimagereader.cc +++ b/lib/imagereader/imdimagereader.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" #include "lib/core/logger.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/config/config.pb.h" #include #include diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc index 3333e6b7..ac76e220 100644 --- a/lib/imagereader/imgimagereader.cc +++ b/lib/imagereader/imgimagereader.cc @@ -1,14 +1,14 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include "lib/layout.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include #include #include diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc index 20f55de0..860aaf22 100644 --- a/lib/imagereader/jv3imagereader.cc +++ b/lib/imagereader/jv3imagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include diff --git a/lib/imagereader/nfdimagereader.cc b/lib/imagereader/nfdimagereader.cc index 70864a6c..72693b07 100644 --- a/lib/imagereader/nfdimagereader.cc +++ b/lib/imagereader/nfdimagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagereader/nsiimagereader.cc b/lib/imagereader/nsiimagereader.cc index 2b00f7c1..fac57cb0 100644 --- a/lib/imagereader/nsiimagereader.cc +++ b/lib/imagereader/nsiimagereader.cc @@ -2,9 +2,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/imagereader/imagereader.pb.h" #include diff --git a/lib/imagereader/td0imagereader.cc b/lib/imagereader/td0imagereader.cc index 47bef5f7..cfcae93c 100644 --- a/lib/imagereader/td0imagereader.cc +++ b/lib/imagereader/td0imagereader.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagereader/imagereader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/crc.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc index 691632fc..1b4ebb14 100644 --- a/lib/imagewriter/d64imagewriter.cc +++ b/lib/imagewriter/d64imagewriter.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/ldbs.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagewriter/d88imagewriter.cc b/lib/imagewriter/d88imagewriter.cc index 84d0bc3c..818db027 100644 --- a/lib/imagewriter/d88imagewriter.cc +++ b/lib/imagewriter/d88imagewriter.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/config.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/core/logger.h" #include #include diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc index 60845ba5..0f66ba44 100644 --- a/lib/imagewriter/diskcopyimagewriter.cc +++ b/lib/imagewriter/diskcopyimagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/ldbs.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include diff --git a/lib/imagewriter/imagewriter.cc b/lib/imagewriter/imagewriter.cc index 8f8e4f5e..f0fd463b 100644 --- a/lib/imagewriter/imagewriter.cc +++ b/lib/imagewriter/imagewriter.cc @@ -1,13 +1,13 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/utils.h" #include "lib/config/config.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/core/logger.h" #include #include diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc index 9e397de6..1a2537e7 100644 --- a/lib/imagewriter/imdimagewriter.cc +++ b/lib/imagewriter/imdimagewriter.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/config.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/core/logger.h" #include #include diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc index 4b37eb87..7cf05ac2 100644 --- a/lib/imagewriter/imgimagewriter.cc +++ b/lib/imagewriter/imgimagewriter.cc @@ -1,12 +1,12 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" #include "lib/config/config.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/layout.pb.h" #include "lib/core/logger.h" #include diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc index 129b8f84..750e55c2 100644 --- a/lib/imagewriter/ldbsimagewriter.cc +++ b/lib/imagewriter/ldbsimagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/ldbs.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include diff --git a/lib/imagewriter/nsiimagewriter.cc b/lib/imagewriter/nsiimagewriter.cc index 285ff008..93ddf706 100644 --- a/lib/imagewriter/nsiimagewriter.cc +++ b/lib/imagewriter/nsiimagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/decoders/decoders.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "arch/northstar/northstar.h" #include "lib/imagewriter/imagewriter.pb.h" diff --git a/lib/imagewriter/rawimagewriter.cc b/lib/imagewriter/rawimagewriter.cc index 11b56e24..d32623ae 100644 --- a/lib/imagewriter/rawimagewriter.cc +++ b/lib/imagewriter/rawimagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/decoders/decoders.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/core/logger.h" #include "arch/northstar/northstar.h" #include "lib/imagewriter/imagewriter.pb.h" diff --git a/lib/readerwriter.cc b/lib/readerwriter.cc index 02fb462b..153ab32d 100644 --- a/lib/readerwriter.cc +++ b/lib/readerwriter.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/readerwriter.h" #include "protocol.h" #include "lib/usb/usb.h" @@ -11,10 +11,10 @@ #include "lib/fluxsink/fluxsink.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/sector.h" -#include "lib/image.h" +#include "lib/data/sector.h" +#include "lib/data/image.h" #include "lib/core/logger.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/core/utils.h" #include "lib/config/config.pb.h" #include "lib/config/proto.h" diff --git a/lib/usb/applesauceusb.cc b/lib/usb/applesauceusb.cc index c3d0551d..fa15a823 100644 --- a/lib/usb/applesauceusb.cc +++ b/lib/usb/applesauceusb.cc @@ -1,6 +1,6 @@ #include "lib/globals.h" #include "protocol.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "lib/usb/usb.pb.h" #include "lib/core/utils.h" diff --git a/lib/usb/fluxengineusb.cc b/lib/usb/fluxengineusb.cc index 02a71e89..7000d7ab 100644 --- a/lib/usb/fluxengineusb.cc +++ b/lib/usb/fluxengineusb.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "usb.h" #include "protocol.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "libusbp_config.h" #include "libusbp.hpp" diff --git a/lib/usb/greaseweazleusb.cc b/lib/usb/greaseweazleusb.cc index 561fc382..3b0effae 100644 --- a/lib/usb/greaseweazleusb.cc +++ b/lib/usb/greaseweazleusb.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "protocol.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "lib/usb/usb.pb.h" #include "greaseweazle.h" diff --git a/lib/usb/serial.cc b/lib/usb/serial.cc index 091888ea..2e21eb1c 100644 --- a/lib/usb/serial.cc +++ b/lib/usb/serial.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "usb.h" #include "protocol.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "serial.h" #include diff --git a/lib/usb/usb.cc b/lib/usb/usb.cc index 704c92c1..e55a6e8d 100644 --- a/lib/usb/usb.cc +++ b/lib/usb/usb.cc @@ -5,7 +5,7 @@ #include "libusbp_config.h" #include "libusbp.hpp" #include "protocol.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/core/bytes.h" #include "lib/config/proto.h" #include "usbfinder.h" diff --git a/lib/vfs/amigaffs.cc b/lib/vfs/amigaffs.cc index 28d2464a..76b38368 100644 --- a/lib/vfs/amigaffs.cc +++ b/lib/vfs/amigaffs.cc @@ -3,7 +3,7 @@ #include "lib/vfs/vfs.h" #include "lib/config/config.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/core/logger.h" #include "adflib.h" diff --git a/lib/vfs/fluxsectorinterface.cc b/lib/vfs/fluxsectorinterface.cc index 1eff8bf9..c3f5ea58 100644 --- a/lib/vfs/fluxsectorinterface.cc +++ b/lib/vfs/fluxsectorinterface.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "lib/vfs/sectorinterface.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/readerwriter.h" #include "lib/decoders/decoders.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "lib/config/proto.h" class FluxSectorInterface : public SectorInterface diff --git a/lib/vfs/imagesectorinterface.cc b/lib/vfs/imagesectorinterface.cc index 07633c1c..87d8df15 100644 --- a/lib/vfs/imagesectorinterface.cc +++ b/lib/vfs/imagesectorinterface.cc @@ -2,9 +2,9 @@ #include "lib/vfs/sectorinterface.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/image.h" -#include "lib/layout.h" -#include "lib/sector.h" +#include "lib/data/image.h" +#include "lib/data/layout.h" +#include "lib/data/sector.h" #include "lib/core/bytes.h" class ImageSectorInterface : public SectorInterface diff --git a/lib/vfs/vfs.cc b/lib/vfs/vfs.cc index 0d0b8298..f150540b 100644 --- a/lib/vfs/vfs.cc +++ b/lib/vfs/vfs.cc @@ -3,9 +3,9 @@ #include "vfs.h" #include "lib/config/proto.h" #include "lib/layout.pb.h" -#include "lib/layout.h" -#include "lib/image.h" -#include "lib/sector.h" +#include "lib/data/layout.h" +#include "lib/data/image.h" +#include "lib/data/sector.h" #include "lib/vfs/sectorinterface.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/lib/vfs/zdos.cc b/lib/vfs/zdos.cc index 0541e006..a08f2c04 100644 --- a/lib/vfs/zdos.cc +++ b/lib/vfs/zdos.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" #include "lib/config/config.pb.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include /* See diff --git a/src/fe-analysedriveresponse.cc b/src/fe-analysedriveresponse.cc index 829a8660..04cfccbe 100644 --- a/src/fe-analysedriveresponse.cc +++ b/src/fe-analysedriveresponse.cc @@ -3,7 +3,7 @@ #include "lib/config/flags.h" #include "lib/usb/usb.h" #include "lib/core/bitmap.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/readerwriter.h" #include "protocol.h" diff --git a/src/fe-analyselayout.cc b/src/fe-analyselayout.cc index d4d64c19..b23554cb 100644 --- a/src/fe-analyselayout.cc +++ b/src/fe-analyselayout.cc @@ -3,10 +3,10 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/core/bitmap.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/core/csvreader.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/decoders/fluxmapreader.h" #include "agg2d.h" #include "stb_image_write.h" diff --git a/src/fe-format.cc b/src/fe-format.cc index 172ef99f..c8440a08 100644 --- a/src/fe-format.cc +++ b/src/fe-format.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" diff --git a/src/fe-getdiskinfo.cc b/src/fe-getdiskinfo.cc index bfdc82e4..28d890bb 100644 --- a/src/fe-getdiskinfo.cc +++ b/src/fe-getdiskinfo.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" diff --git a/src/fe-getfile.cc b/src/fe-getfile.cc index 567c11f9..bc4daf80 100644 --- a/src/fe-getfile.cc +++ b/src/fe-getfile.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" diff --git a/src/fe-getfileinfo.cc b/src/fe-getfileinfo.cc index 3416acf8..801f5980 100644 --- a/src/fe-getfileinfo.cc +++ b/src/fe-getfileinfo.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" diff --git a/src/fe-inspect.cc b/src/fe-inspect.cc index af9ba5a4..c4048e50 100644 --- a/src/fe-inspect.cc +++ b/src/fe-inspect.cc @@ -2,14 +2,14 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/readerwriter.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/decoders/fluxdecoder.h" #include "lib/decoders/decoders.h" #include "lib/fluxsource/fluxsource.h" #include "protocol.h" #include "lib/decoders/rawbits.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" static FlagGroup flags; @@ -78,8 +78,8 @@ static nanoseconds_t guessClock(const Fluxmap& fluxmap) if (manualClockRate != 0.0) return manualClockRate * 1000.0; - auto data = - fluxmap.guessClock(noiseFloorFactor.get(), signalLevelFactor.get()); + auto data = FluxmapReader(fluxmap).guessClock( + noiseFloorFactor.get(), signalLevelFactor.get()); std::cout << "\nClock detection histogram:" << std::endl; diff --git a/src/fe-ls.cc b/src/fe-ls.cc index 2c289906..0854cdb9 100644 --- a/src/fe-ls.cc +++ b/src/fe-ls.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/decoders/decoders.h" diff --git a/src/fe-merge.cc b/src/fe-merge.cc index 4cb9174a..e971f4e7 100644 --- a/src/fe-merge.cc +++ b/src/fe-merge.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" -#include "lib/flux.h" +#include "lib/data/flux.h" #include "lib/fl2.h" #include "lib/fl2.pb.h" #include "src/fluxengine.h" diff --git a/src/fe-putfile.cc b/src/fe-putfile.cc index d07b4c2e..704663bc 100644 --- a/src/fe-putfile.cc +++ b/src/fe-putfile.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" diff --git a/src/fe-rawread.cc b/src/fe-rawread.cc index 0be078a2..d4e14b44 100644 --- a/src/fe-rawread.cc +++ b/src/fe-rawread.cc @@ -2,9 +2,9 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/readerwriter.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/fluxsink/fluxsink.h" #include "lib/fluxsource/fluxsource.h" diff --git a/src/fe-rawwrite.cc b/src/fe-rawwrite.cc index 825be0e2..9c8ea290 100644 --- a/src/fe-rawwrite.cc +++ b/src/fe-rawwrite.cc @@ -2,8 +2,8 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/readerwriter.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" diff --git a/src/fe-read.cc b/src/fe-read.cc index 1d4e8b55..92ed83eb 100644 --- a/src/fe-read.cc +++ b/src/fe-read.cc @@ -2,9 +2,9 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/readerwriter.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" diff --git a/src/fe-write.cc b/src/fe-write.cc index a34a6c87..1ff293fc 100644 --- a/src/fe-write.cc +++ b/src/fe-write.cc @@ -2,10 +2,10 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/readerwriter.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/fluxsink/fluxsink.h" #include "lib/fluxsource/fluxsource.h" diff --git a/src/fileutils.cc b/src/fileutils.cc index 1553459e..f588d05f 100644 --- a/src/fileutils.cc +++ b/src/fileutils.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/fluxmap.h" -#include "lib/sector.h" +#include "lib/data/fluxmap.h" +#include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/fluxsource/fluxsource.h" diff --git a/src/gui/browserpanel.cc b/src/gui/browserpanel.cc index 914ed323..3f16d516 100644 --- a/src/gui/browserpanel.cc +++ b/src/gui/browserpanel.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/vfs/vfs.h" #include "lib/core/utils.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "filesystemmodel.h" #include "fileviewerwindow.h" #include "textviewerwindow.h" diff --git a/src/gui/explorerpanel.cc b/src/gui/explorerpanel.cc index edf04d16..e972cedd 100644 --- a/src/gui/explorerpanel.cc +++ b/src/gui/explorerpanel.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.h" #include "lib/decoders/decoders.h" #include "lib/config/proto.h" diff --git a/src/gui/fileviewerwindow.cc b/src/gui/fileviewerwindow.cc index f06fe878..65264bed 100644 --- a/src/gui/fileviewerwindow.cc +++ b/src/gui/fileviewerwindow.cc @@ -2,7 +2,7 @@ #include "lib/core/utils.h" #include "lib/core/bytes.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "fileviewerwindow.h" FileViewerWindow::FileViewerWindow( diff --git a/src/gui/fluxviewercontrol.cc b/src/gui/fluxviewercontrol.cc index e5d7fa1f..81c4134f 100644 --- a/src/gui/fluxviewercontrol.cc +++ b/src/gui/fluxviewercontrol.cc @@ -2,12 +2,12 @@ #include "gui.h" #include "fluxviewercontrol.h" #include "textviewerwindow.h" -#include "lib/flux.h" -#include "lib/fluxmap.h" +#include "lib/data/flux.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/decoders/decoders.pb.h" -#include "lib/sector.h" -#include "lib/layout.h" +#include "lib/data/sector.h" +#include "lib/data/layout.h" #include "lib/decoders/fluxmapreader.h" #include "lib/core/crc.h" diff --git a/src/gui/fluxviewerwindow.cc b/src/gui/fluxviewerwindow.cc index 2b691f5e..839de569 100644 --- a/src/gui/fluxviewerwindow.cc +++ b/src/gui/fluxviewerwindow.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "fluxviewerwindow.h" #include "fluxviewercontrol.h" -#include "lib/flux.h" -#include "lib/layout.h" +#include "lib/data/flux.h" +#include "lib/data/layout.h" FluxViewerWindow::FluxViewerWindow( wxWindow* parent, std::shared_ptr flux): diff --git a/src/gui/histogramviewer.cc b/src/gui/histogramviewer.cc index 10fabeca..904bf1a9 100644 --- a/src/gui/histogramviewer.cc +++ b/src/gui/histogramviewer.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "gui.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "histogramviewer.h" static constexpr int BORDER = 10; @@ -29,7 +29,7 @@ HistogramViewer::HistogramViewer(wxWindow* parent, void HistogramViewer::Redraw(const Fluxmap& fluxmap, nanoseconds_t clock) { - _data = fluxmap.guessClock(); + _data = FluxmapReader(fluxmap).guessClock(); _clock = clock; _blank = false; Refresh(); diff --git a/src/gui/histogramviewer.h b/src/gui/histogramviewer.h index 1bfd761e..fd5d64ac 100644 --- a/src/gui/histogramviewer.h +++ b/src/gui/histogramviewer.h @@ -1,7 +1,8 @@ #pragma once #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" +#include "lib/decoders/fluxmapreader.h" class HistogramViewer : public wxWindow { @@ -31,7 +32,7 @@ private: private: bool _blank = true; - Fluxmap::ClockData _data; + FluxmapReader::ClockData _data; wxFont _font; nanoseconds_t _clock; wxDECLARE_EVENT_TABLE(); diff --git a/src/gui/idlepanel.cc b/src/gui/idlepanel.cc index 67275341..8a485a03 100644 --- a/src/gui/idlepanel.cc +++ b/src/gui/idlepanel.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "gui.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/usb/usbfinder.h" #include "lib/config/proto.h" #include "lib/config/flags.h" @@ -10,7 +10,7 @@ #include "lib/fluxsink/fluxsink.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "texteditorwindow.h" #include "iconbutton.h" #include "context.h" diff --git a/src/gui/imagerpanel.cc b/src/gui/imagerpanel.cc index 7280e05d..d0305882 100644 --- a/src/gui/imagerpanel.cc +++ b/src/gui/imagerpanel.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/config/config.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" #include "lib/imagereader/imagereader.h" @@ -10,7 +10,7 @@ #include "lib/config/proto.h" #include "lib/readerwriter.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "fluxviewerwindow.h" #include "jobqueue.h" #include "context.h" diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc index 4aa2e85d..639e7f89 100644 --- a/src/gui/mainwindow.cc +++ b/src/gui/mainwindow.cc @@ -19,7 +19,7 @@ #include "customstatusbar.h" #include "context.h" #include "lib/vfs/vfs.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include #include #include diff --git a/src/gui/texteditorwindow.cc b/src/gui/texteditorwindow.cc index 7bc2eb73..2011516b 100644 --- a/src/gui/texteditorwindow.cc +++ b/src/gui/texteditorwindow.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "texteditorwindow.h" wxDEFINE_EVENT(EDITOR_SAVE_EVENT, EditorSaveEvent); diff --git a/src/gui/textviewerwindow.cc b/src/gui/textviewerwindow.cc index e779f9c7..fe0d5f1b 100644 --- a/src/gui/textviewerwindow.cc +++ b/src/gui/textviewerwindow.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "gui.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "textviewerwindow.h" TextViewerWindow::TextViewerWindow(wxWindow* parent, diff --git a/src/gui/visualisationcontrol.cc b/src/gui/visualisationcontrol.cc index d5d5033e..e906b0ae 100644 --- a/src/gui/visualisationcontrol.cc +++ b/src/gui/visualisationcontrol.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" #include "gui.h" #include "visualisationcontrol.h" -#include "lib/fluxmap.h" -#include "lib/flux.h" -#include "lib/sector.h" -#include "lib/image.h" -#include "lib/layout.h" +#include "lib/data/fluxmap.h" +#include "lib/data/flux.h" +#include "lib/data/sector.h" +#include "lib/data/image.h" +#include "lib/data/layout.h" #define BORDER 20 #define TICK 3 diff --git a/tests/cpmfs.cc b/tests/cpmfs.cc index 071e8900..c3b682bd 100644 --- a/tests/cpmfs.cc +++ b/tests/cpmfs.cc @@ -3,9 +3,9 @@ #include "lib/vfs/vfs.h" #include "lib/vfs/sectorinterface.h" #include "lib/vfs/vfs.pb.h" -#include "lib/image.h" +#include "lib/data/image.h" #include "lib/config/proto.h" -#include "lib/sector.h" +#include "lib/data/sector.h" #include "snowhouse/snowhouse.h" #include diff --git a/tests/fluxmapreader.cc b/tests/fluxmapreader.cc index ebff7e1d..33609188 100644 --- a/tests/fluxmapreader.cc +++ b/tests/fluxmapreader.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "protocol.h" #include "fmt/format.h" diff --git a/tests/fluxpattern.cc b/tests/fluxpattern.cc index be82120e..c0fb8e9a 100644 --- a/tests/fluxpattern.cc +++ b/tests/fluxpattern.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/decoders/fluxpattern.h" #include diff --git a/tests/flx.cc b/tests/flx.cc index 48c27f74..ad802ba0 100644 --- a/tests/flx.cc +++ b/tests/flx.cc @@ -2,7 +2,7 @@ #include #include #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/flx.h" static void test_convert(const Bytes& flxbytes, const Bytes& fluxmapbytes) diff --git a/tests/greaseweazle.cc b/tests/greaseweazle.cc index 5dbab596..6b3dc12c 100644 --- a/tests/greaseweazle.cc +++ b/tests/greaseweazle.cc @@ -2,7 +2,7 @@ #include #include #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/usb/greaseweazle.h" #define E28(val) \ diff --git a/tests/kryoflux.cc b/tests/kryoflux.cc index f78c8853..3887f14b 100644 --- a/tests/kryoflux.cc +++ b/tests/kryoflux.cc @@ -2,7 +2,7 @@ #include #include #include "lib/core/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsource/kryoflux.h" static void test_convert(const Bytes& kryofluxbytes, const Bytes& fluxmapbytes) diff --git a/tests/layout.cc b/tests/layout.cc index 86b4bb62..750fec30 100644 --- a/tests/layout.cc +++ b/tests/layout.cc @@ -3,7 +3,7 @@ #include "lib/config/config.h" #include "lib/config/config.pb.h" #include "lib/config/proto.h" -#include "lib/layout.h" +#include "lib/data/layout.h" #include "snowhouse/snowhouse.h" #include #include diff --git a/tools/upgrade-flux-file.cc b/tools/upgrade-flux-file.cc index a0282999..47c7894e 100644 --- a/tools/upgrade-flux-file.cc +++ b/tools/upgrade-flux-file.cc @@ -1,5 +1,5 @@ #include "lib/globals.h" -#include "lib/fluxmap.h" +#include "lib/data/fluxmap.h" #include "lib/fluxsink/fluxsink.h" #include "lib/core/bytes.h" #include "fmt/format.h"