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

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/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 <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"