Create a config module containing all the configuration, proto and flags

stuff.

arch/ibm/decoder.cc

@@ -7,7 +7,7 @@
 #include "lib/decoders/fluxpattern.h"
 #include "lib/sector.h"
 #include "arch/ibm/ibm.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <string.h>
 

arch/ibm/encoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "ibm.h"
@@ -9,7 +9,7 @@
 #include "arch/ibm/ibm.pb.h"
 #include "lib/encoders/encoders.pb.h"
 #include "fmt/format.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <ctype.h>
 

arch/tartu/decoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "arch/tartu/tartu.h"
 #include "lib/core/crc.h"

arch/tartu/encoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/tartu/tartu.h"

build.py

@@ -25,7 +25,6 @@ protocc(name="fl2_proto_lib", srcs=["+fl2_proto"])
 cxxlibrary(
     name="lib",
     srcs=[
-        "./lib/config.cc",
         "./lib/decoders/decoders.cc",
         "./lib/decoders/fluxdecoder.cc",
         "./lib/decoders/fluxmapreader.cc",
@@ -33,7 +32,6 @@ cxxlibrary(
         "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
         "./lib/fl2.cc",
-        "./lib/flags.cc",
         "./lib/fluxmap.cc",
         "./lib/fluxsink/a2rfluxsink.cc",
         "./lib/fluxsink/aufluxsink.cc",
@@ -83,7 +81,6 @@ cxxlibrary(
         "./lib/layout.cc",
         "./lib/ldbs.cc",
         "./lib/logrenderer.cc",
-        "./lib/proto.cc",
         "./lib/readerwriter.cc",
         "./lib/sector.cc",
         "./lib/usb/applesauceusb.cc",
@@ -156,7 +153,6 @@ cxxlibrary(
         "arch/c64/c64.h": "./arch/c64/c64.h",
         "arch/tartu/tartu.h": "./arch/tartu/tartu.h",
         "lib/a2r.h": "./lib/a2r.h",
-        "lib/config.h": "./lib/config.h",
         "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
         "lib/decoders/fluxmapreader.h": "./lib/decoders/fluxmapreader.h",
@@ -165,7 +161,6 @@ cxxlibrary(
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/scp.h": "./lib/scp.h",
         "lib/fl2.h": "./lib/fl2.h",
-        "lib/flags.h": "./lib/flags.h",
         "lib/flux.h": "./lib/flux.h",
         "lib/fluxmap.h": "./lib/fluxmap.h",
         "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
@@ -179,7 +174,6 @@ cxxlibrary(
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/layout.h": "./lib/layout.h",
         "lib/ldbs.h": "./lib/ldbs.h",
-        "lib/proto.h": "./lib/proto.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
         "lib/sector.h": "./lib/sector.h",
         "lib/usb/applesauce.h": "./lib/usb/applesauce.h",
@@ -196,8 +190,8 @@ cxxlibrary(
         "dep/hfsutils",
         "dep/libusbp",
         "dep/stb",
-        "lib+config_proto_lib",
         "lib/core",
+        "lib/config",
         "lib/fluxsource+proto_lib",
     ],
 )

lib/build.py

@@ -25,38 +25,3 @@ protocc(
     srcs=[".+drive_proto"],
     deps=[".+common_proto_lib", "+fl2_proto_lib", ".+layout_proto_lib"],
 )
-
-proto(
-    name="config_proto",
-    srcs=["./config.proto"],
-    deps=[
-        ".+common_proto",
-        ".+layout_proto",
-        ".+drive_proto",
-        "+fl2_proto",
-        "lib/fluxsource+proto",
-        "lib/fluxsink+proto",
-        "lib/vfs+proto",
-        "lib/usb+proto",
-        "lib/encoders+proto",
-        "lib/decoders+proto",
-        "lib/imagereader+proto",
-        "lib/imagewriter+proto",
-    ],
-)
-
-protocc(
-    name="config_proto_lib",
-    srcs=[".+common_proto", ".+config_proto", "arch+proto", "+fl2_proto"],
-    deps=[
-        "lib/fluxsource+proto_lib",
-        "lib/fluxsink+proto_lib",
-        "lib/vfs+proto_lib",
-        "lib/usb+proto_lib",
-        "lib/encoders+proto_lib",
-        "lib/decoders+proto_lib",
-        "lib/imagereader+proto_lib",
-        "lib/imagewriter+proto_lib",
-        "lib+drive_proto_lib",
-    ],
-)

lib/config/build.py

@@ -0,0 +1,56 @@
+from build.c import cxxlibrary
+from build.protobuf import proto, protocc
+
+proto(
+    name="proto",
+    srcs=["./config.proto"],
+    deps=[
+        "lib+common_proto",
+        "lib+layout_proto",
+        "lib+drive_proto",
+        "+fl2_proto",
+        "lib/fluxsource+proto",
+        "lib/fluxsink+proto",
+        "lib/vfs+proto",
+        "lib/usb+proto",
+        "lib/encoders+proto",
+        "lib/decoders+proto",
+        "lib/imagereader+proto",
+        "lib/imagewriter+proto",
+    ],
+)
+
+protocc(
+    name="proto_lib",
+    srcs=[".+proto", "arch+proto", "+fl2_proto"],
+    deps=[
+        "lib/fluxsource+proto_lib",
+        "lib/fluxsink+proto_lib",
+        "lib/vfs+proto_lib",
+        "lib/usb+proto_lib",
+        "lib/encoders+proto_lib",
+        "lib/decoders+proto_lib",
+        "lib/imagereader+proto_lib",
+        "lib/imagewriter+proto_lib",
+        "lib+drive_proto_lib",
+    ],
+)
+
+cxxlibrary(
+    name="config",
+    srcs=[
+        "./config.cc",
+        "./proto.cc",
+        "./flags.cc",
+    ],
+    hdrs={
+        "lib/config/config.h": "./config.h",
+        "lib/config/proto.h": "./proto.h",
+        "lib/config/flags.h": "./flags.h",
+    },
+    deps=[
+        "lib/core",
+        ".+proto_lib",
+        "+fmt_lib",
+    ],
+)

lib/config/config.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/core/utils.h"
 #include <fstream>

lib/config/config.h

@@ -3,7 +3,7 @@
 #ifdef __cplusplus
 
 #include <google/protobuf/message.h>
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/common.pb.h"
 
 class ConfigProto;

lib/config/flags.cc

@@ -1,11 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include "lib/core/logger.h"
-#include "lib/fluxsource/fluxsource.h"
-#include "lib/imagereader/imagereader.h"
 #include <google/protobuf/text_format.h>
 #include <regex>
 #include <fstream>

lib/config/proto.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/common.pb.h"
 #include <regex>
 

lib/config/proto.h

@@ -3,7 +3,7 @@
 
 #include <google/protobuf/message.h>
 #include "lib/common.pb.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 class ProtoPathNotFoundException : public ErrorException
 {

lib/decoders/decoders.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/agat/agat.h"

lib/decoders/fluxmapreader.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>

lib/decoders/fluxmapreader.h

@@ -2,7 +2,7 @@
 #define FLUXMAPREADER_H
 
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class DecoderProto;

lib/decoders/fluxpattern.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>

lib/decoders/fluxpattern.h

@@ -2,7 +2,7 @@
 
 #include "lib/core/utils.h"
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class FluxMatcher;

lib/encoders/encoders.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
@@ -16,7 +16,7 @@
 #include "arch/tids990/tids990.h"
 #include "arch/victor9k/victor9k.h"
 #include "lib/encoders/encoders.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/image.h"
 #include "protocol.h"

lib/fl2.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/fl2.pb.h"
 #include <fstream>

lib/fluxsink/a2rfluxsink.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
@@ -7,7 +7,7 @@
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/a2r.h"

lib/fluxsink/aufluxsink.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/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/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/fluxsink/fl2fluxsink.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/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/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fl2.pb.h"
 #include "lib/fl2.h"
 #include <fstream>

lib/fluxsink/fluxsink.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/config.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include <regex>
 

lib/fluxsink/fluxsink.h

@@ -1,7 +1,7 @@
 #ifndef FLUXSINK_H
 #define FLUXSINK_H
 
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include <ostream>
 
 class Fluxmap;

lib/fluxsink/hardwarefluxsink.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsink/fluxsink.pb.h"

lib/fluxsink/scpfluxsink.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/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/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/scp.h"

lib/fluxsink/vcdfluxsink.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/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/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/fluxsource/a2rfluxsource.cc

@@ -2,7 +2,7 @@
 #include "lib/fluxmap.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 
 struct A2Rv2Flux

lib/fluxsource/cwffluxsource.cc

@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 
 struct CwfHeader

lib/fluxsource/dmkfluxsource.cc

@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include <fstream>
 #include <filesystem>

lib/fluxsource/fl2fluxsource.cc

@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fl2.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fl2.h"
 #include "lib/fluxmap.h"
 #include <fstream>

lib/fluxsource/fluxsource.cc

@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxmap.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 
 std::unique_ptr<FluxSource> FluxSource::create(Config& config)

lib/fluxsource/fluxsource.h

@@ -1,8 +1,8 @@
 #ifndef FLUXSOURCE_H
 #define FLUXSOURCE_H
 
-#include "lib/flags.h"
-#include "lib/config.pb.h"
+#include "lib/config/flags.h"
+#include "lib/config/config.pb.h"
 
 class A2rFluxSourceProto;
 class CwfFluxSourceProto;

lib/fluxsource/hardwarefluxsource.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/fluxsource.pb.h"

lib/fluxsource/scpfluxsource.cc

@@ -5,7 +5,7 @@
 #include "lib/core/utils.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/scp.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include <fstream>
 

lib/globals.h

@@ -67,6 +67,6 @@ struct overloaded : Ts...
 template <class... Ts>
 overloaded(Ts...) -> overloaded<Ts...>;
 
-#include "lib/config.h"
+#include "lib/config/config.h"
 
 #endif

lib/imagereader/d64imagereader.cc

@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/d88imagereader.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/dimimagereader.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
-#include "lib/config.pb.h"
+#include "lib/config/proto.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/diskcopyimagereader.cc

@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/fdiimagereader.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/imagereader.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/core/utils.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/image.h"
 #include "lib/layout.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/logger.h"
 #include <algorithm>
 #include <ctype.h>

lib/imagereader/imagereader.h

@@ -2,7 +2,7 @@
 #define IMAGEREADER_H
 
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 class ImageSpec;
 class ImageReaderProto;

lib/imagereader/imdimagereader.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/layout.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/imgimagereader.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <algorithm>
 #include <iostream>

lib/imagereader/jv3imagereader.cc

@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/nfdimagereader.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagereader/nsiimagereader.cc

@@ -1,7 +1,7 @@
 /* Image reader for Northstar floppy disk images */
 
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"

lib/imagereader/td0imagereader.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/crc.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/d64imagewriter.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/ldbs.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/d88imagewriter.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <algorithm>

lib/imagewriter/diskcopyimagewriter.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/imagewriter.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <iostream>

lib/imagewriter/imdimagewriter.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <algorithm>

lib/imagewriter/imgimagewriter.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/proto.h"
-#include "lib/config.pb.h"
+#include "lib/config/proto.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/layout.pb.h"
 #include "lib/core/logger.h"

lib/imagewriter/ldbsimagewriter.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

lib/imagewriter/nsiimagewriter.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"

lib/imagewriter/rawimagewriter.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"

lib/layout.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/layout.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/fl2.h"
 

lib/readerwriter.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/readerwriter.h"
 #include "protocol.h"
@@ -16,8 +16,8 @@
 #include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include <optional>
 
 enum ReadResult

lib/usb/usb.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "usb.h"
 #include "libusbp_config.h"
 #include "libusbp.hpp"
 #include "protocol.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "usbfinder.h"
 #include "lib/core/logger.h"
 #include "applesauce.h"

lib/usb/usb.h

@@ -2,7 +2,7 @@
 #define USB_H
 
 #include "lib/core/bytes.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 
 class Fluxmap;
 class GreaseweazleProto;

lib/usb/usbfinder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "usb.h"
 #include "lib/core/bytes.h"
 #include "usbfinder.h"

lib/vfs/acorndfs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 class AcornDfsFilesystem;

lib/vfs/amigaffs.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 

lib/vfs/appledos.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* This is described here:
  * http://fileformats.archiveteam.org/wiki/Apple_DOS_file_system

lib/vfs/brother120fs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* Number of sectors on a 120kB disk. */
 static constexpr int SECTOR_COUNT = 468;

lib/vfs/cbmfs.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 
 enum

lib/vfs/cpmfs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "fmt/format.h"
 #include <regex>
 

lib/vfs/fatfs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 extern "C"

lib/vfs/fluxsectorinterface.cc

@@ -5,7 +5,7 @@
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/layout.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 
 class FluxSectorInterface : public SectorInterface
 {

lib/vfs/lif.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include <iomanip>
 

lib/vfs/machfs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/vfs/applesingle.h"
 #include "lib/core/utils.h"
 

lib/vfs/microdos.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include "fmt/format.h"
 

lib/vfs/philefs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 /* Root block:

lib/vfs/prodos.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* This is described here:
  * http://fileformats.archiveteam.org/wiki/ProDOS_file_system

lib/vfs/roland.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include <regex>
 

lib/vfs/smaky6fs.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 /* A directory entry looks like:

lib/vfs/vfs.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "vfs.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.pb.h"
 #include "lib/layout.h"
 #include "lib/image.h"
@@ -13,7 +13,7 @@
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 Path::Path(const std::vector<std::string> other):

lib/vfs/zdos.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include <iomanip>
 

scripts/build.py

@@ -12,7 +12,7 @@ def protoencode_single(self, name, srcs: Targets, proto, symbol):
             srcs=["scripts/protoencode.cc"],
             cflags=["-DPROTO=" + proto],
             deps=[
-                "lib+config_proto_lib",
+                "lib/config+proto_lib",
                 "lib/fluxsource+proto_lib",
                 "lib/fluxsink+proto_lib",
                 "tests+test_proto_lib",
@@ -62,7 +62,7 @@ cxxprogram(
     srcs=["./mkdoc.cc"],
     deps=[
         "src/formats",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "lib/fluxsink+proto_lib",
         "+lib",
@@ -76,7 +76,7 @@ cxxprogram(
     srcs=["./mkdocindex.cc"],
     deps=[
         "src/formats",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "lib/fluxsink+proto_lib",
         "+lib",

scripts/mkdoc.cc

@@ -1,6 +1,6 @@
 #include "lib/globals.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "fmt/format.h"
 
 extern const std::map<std::string, const ConfigProto*> formats;

scripts/mkdocindex.cc

@@ -1,6 +1,6 @@
 #include "lib/globals.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "fmt/format.h"
 
 extern const std::map<std::string, const ConfigProto*> formats;

scripts/protoencode.cc

@@ -4,7 +4,7 @@
 #include <fstream>
 #include "fmt/format.h"
 #include "tests/testproto.pb.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <sstream>
 #include <locale>
 
@@ -124,7 +124,7 @@ int main(int argc, const char* argv[])
     auto name = argv[3];
 
     output << "#include \"lib/globals.h\"\n"
-           << "#include \"lib/proto.h\"\n"
+           << "#include \"lib/config/proto.h\"\n"
            << "#include <string_view>\n"
            << "static const uint8_t " << name << "_rawData[] = {";
 

src/build.py

@@ -44,7 +44,7 @@ cxxprogram(
         "+lib",
         "lib/core",
         "lib/vfs",
-        "lib+config_proto_lib",
+        "lib/config",
         "lib/fluxsource+proto_lib",
         "src/formats",
     ],

src/fe-analysedriveresponse.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 #include "lib/core/bitmap.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/readerwriter.h"
 #include "protocol.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "agg2d.h"
 #include "stb_image_write.h"

src/fe-analyselayout.cc

@@ -1,7 +1,7 @@
 #define _USE_MATH_DEFINES
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/core/bitmap.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"

src/fe-format.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"

src/fe-getdiskinfo.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"

src/fe-getfile.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"

src/fe-getfileinfo.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"

src/fe-inspect.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
@@ -10,7 +10,7 @@
 #include "protocol.h"
 #include "lib/decoders/rawbits.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 
 static FlagGroup flags;
 

src/fe-ls.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"

src/fe-merge.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/flux.h"
 #include "lib/fl2.h"
 #include "lib/fl2.pb.h"

src/fe-mkdir.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "fluxengine.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"

src/fe-mv.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "fluxengine.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"

src/fe-putfile.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"

src/fe-rawread.cc

@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/imagewriter/imagewriter.h"