Move a lot of the data-handling utilities into their own module.

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 <string.h>

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 <string.h>

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/data/image.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include "arch/agat/agat.pb.h"
 #include "lib/encoders/encoders.pb.h"
 

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"

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"
 

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"

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 <ctype.h>

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 <ctype.h>

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"
 

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"

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 <ctype.h>
 #include "lib/core/bytes.h"
 

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"

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"

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 <string.h>
 
 static_assert(std::is_trivially_copyable<IbmIdam>::value,

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 <ctype.h>
 
 /* IAM record separator:

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"

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 <ctype.h>
 

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"

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<bool>& bits,

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 <string.h>
 
 const int SECTOR_SIZE = 256;

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"

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

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 <string.h>

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"

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 <string.h>
 
 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 {
+const FluxMatchers ANY_RECORD_PATTERN{&HEADER_PATTERN, &DATA_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<Decoder> createTartuDecoder(const DecoderProto& config)
 {
     return std::unique_ptr<Decoder>(new TartuDecoder(config));
 }
-

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/data/fluxmap.h"
-#include "lib/sector.h"
+#include "lib/data/sector.h"
 #include <string.h>
 
 class TartuEncoder : public Encoder

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 <string.h>
 #include "fmt/format.h"
 

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"

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"

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 <ctype.h>
 #include "lib/core/bytes.h"
 

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"

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",
     ],
 )

lib/core/build.py

@@ -10,6 +10,7 @@ cxxlibrary(
         "./hexdump.cc",
         "./utils.cc",
         "./logger.cc",
+        "./logrenderer.cc",
     ],
     hdrs={
         "lib/core/bitmap.h": "./bitmap.h",

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

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<std::unique_ptr<const Fluxmap>> Fluxmap::split() const
+{
+    std::vector<std::unique_ptr<const Fluxmap>> maps;
+    auto bytesVector = rawBytes().split(F_DESYNC);
+
+    for (auto bytes : bytesVector)
+    {
+        if (bytes.size() != 0)
+            maps.push_back(std::move(std::make_unique<Fluxmap>(bytes)));
+    }
+
+    return maps;
+}

lib/data/fluxmap.h

@@ -83,19 +83,6 @@ public:
         int threshold_ticks, int amount_ticks);
     std::vector<std::unique_ptr<const Fluxmap>> 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();
 

lib/data/image.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/sector.h"
+#include "lib/data/sector.h"
-#include "lib/image.h"
+#include "lib/data/image.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 
 Image::Image() {}
 

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()
 {

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;

lib/data/sector.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/flux.h"
+#include "lib/data/flux.h"
-#include "lib/sector.h"
+#include "lib/data/sector.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 
 Sector::Sector(const LogicalLocation& location):
     LogicalLocation(location),

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;

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/data/sector.h"
-#include "lib/image.h"
+#include "lib/data/image.h"
 #include "lib/decoders/decoders.pb.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include <numeric>
 
 std::unique_ptr<Decoder> Decoder::create(Config& config)

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);
 

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"

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;
+}

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;

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"

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"
 

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/data/layout.h"
-#include "lib/image.h"
+#include "lib/data/image.h"
 #include "protocol.h"
 
 std::unique_ptr<Encoder> Encoder::create(Config& config)

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 <fstream>
 

lib/fluxmap.cc

@@ -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<std::unique_ptr<const Fluxmap>> Fluxmap::split() const
-{
-    std::vector<std::unique_ptr<const Fluxmap>> maps;
-    auto bytesVector = rawBytes().split(F_DESYNC);
-
-    for (auto bytes : bytesVector)
-    {
-        if (bytes.size() != 0)
-            maps.push_back(std::move(std::make_unique<Fluxmap>(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;
-}

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/data/fluxmap.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include "lib/a2r.h"
 #include <fstream>
 #include <sys/stat.h>

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"

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"

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"

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/data/fluxmap.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include "lib/scp.h"
 #include "lib/core/logger.h"
 #include <fstream>

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"

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"

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"
 

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"

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"

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"
 

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 <fstream>
 
 class Fl2FluxSourceIterator : public FluxSourceIterator

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"

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"

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"

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"

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 <fstream>

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"

lib/fluxsource/memoryfluxsource.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/fluxmap.h"
+#include "lib/data/fluxmap.h"
-#include "lib/flux.h"
+#include "lib/data/flux.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/fluxmap.h"
+#include "lib/data/fluxmap.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include <fstream>
 
 class MemoryFluxSourceIterator : public FluxSourceIterator

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"

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"
 

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 <algorithm>

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"

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"

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 <algorithm>

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"

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/data/image.h"
-#include "lib/layout.h"
+#include "lib/data/layout.h"
 #include "lib/config/config.pb.h"
 #include "lib/core/logger.h"
 #include <algorithm>

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;

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 <algorithm>
 #include <iostream>

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 <algorithm>
 #include <iostream>
 #include <fstream>

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 <algorithm>

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"

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 <algorithm>

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"

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"

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 <algorithm>
 #include <iostream>

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 <algorithm>

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 <iostream>
 #include <fstream>

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 <algorithm>
 #include <iostream>

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 <algorithm>

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 <algorithm>

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"

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"

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/data/sector.h"
-#include "lib/image.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"

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"

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"

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"