Move the external file format stuff into its own module.

Author: davidgiven

build.py

@@ -19,14 +19,10 @@
 
 clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"})
 
-proto(name="fl2_proto", srcs=["lib/fl2.proto"])
-protocc(name="fl2_proto_lib", srcs=["+fl2_proto"])
-
 cxxlibrary(
     name="lib",
     srcs=[
         "./lib/decoders/decoders.cc",
-        "./lib/fl2.cc",
         "./lib/decoders/fluxdecoder.cc",
         "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
@@ -52,7 +48,6 @@
         "./lib/fluxsource/memoryfluxsource.cc",
         "./lib/fluxsource/scpfluxsource.cc",
         "./lib/fluxsource/testpatternfluxsource.cc",
-        "./lib/globals.cc",
         "./lib/imagereader/d64imagereader.cc",
         "./lib/imagereader/d88imagereader.cc",
         "./lib/imagereader/dimimagereader.cc",
@@ -74,7 +69,6 @@
         "./lib/imagewriter/ldbsimagewriter.cc",
         "./lib/imagewriter/nsiimagewriter.cc",
         "./lib/imagewriter/rawimagewriter.cc",
-        "./lib/ldbs.cc",
         "./lib/readerwriter.cc",
         "./lib/usb/applesauceusb.cc",
         "./lib/usb/fluxengineusb.cc",
@@ -145,40 +139,36 @@
         "arch/c64/data_gcr.h": "./arch/c64/data_gcr.h",
         "arch/c64/c64.h": "./arch/c64/c64.h",
         "arch/tartu/tartu.h": "./arch/tartu/tartu.h",
-        "lib/a2r.h": "./lib/a2r.h",
         "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
         "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
-        "lib/scp.h": "./lib/scp.h",
-        "lib/fl2.h": "./lib/fl2.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/imagereader/imagereader.h": "./lib/imagereader/imagereader.h",
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
-        "lib/ldbs.h": "./lib/ldbs.h",
         "lib/readerwriter.h": "./lib/readerwriter.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",
         "lib/usb/usbfinder.h": "./lib/usb/usbfinder.h",
     },
     deps=[
-        "+fl2_proto_lib",
         "+fmt_lib",
         "+protocol",
         "dep/adflib",
         "dep/fatfs",
         "dep/hfsutils",
         "dep/libusbp",
         "dep/stb",
+        "src/formats",
         "lib/core",
         "lib/config",
         "lib/data",
+        "lib/external",
         "lib/fluxsource+proto_lib",
     ],
 )

lib/build.py

@@ -7,21 +7,25 @@
 proto(
     name="layout_proto",
     srcs=["./layout.proto"],
-    deps=[".+common_proto", "+fl2_proto"],
+    deps=[".+common_proto", "lib/external+fl2_proto"],
 )
 protocc(
     name="layout_proto_lib",
     srcs=[".+layout_proto"],
-    deps=[".+common_proto_lib", "+fl2_proto_lib"],
+    deps=[".+common_proto_lib", "lib/external+fl2_proto_lib"],
 )
 
 proto(
     name="drive_proto",
     srcs=["./drive.proto"],
-    deps=[".+common_proto", "+fl2_proto", ".+layout_proto"],
+    deps=[".+common_proto", "lib/external+fl2_proto", ".+layout_proto"],
 )
 protocc(
     name="drive_proto_lib",
     srcs=[".+drive_proto"],
-    deps=[".+common_proto_lib", "+fl2_proto_lib", ".+layout_proto_lib"],
+    deps=[
+        ".+common_proto_lib",
+        "lib/external+fl2_proto_lib",
+        ".+layout_proto_lib",
+    ],
 )

lib/config/build.py

@@ -8,7 +8,7 @@
         "lib+common_proto",
         "lib+layout_proto",
         "lib+drive_proto",
-        "+fl2_proto",
+        "lib/external+fl2_proto",
         "lib/fluxsource+proto",
         "lib/fluxsink+proto",
         "lib/vfs+proto",
@@ -22,7 +22,7 @@
 
 protocc(
     name="proto_lib",
-    srcs=[".+proto", "arch+proto", "+fl2_proto"],
+    srcs=[".+proto", "arch+proto"],
     deps=[
         "lib/fluxsource+proto_lib",
         "lib/fluxsink+proto_lib",
@@ -32,6 +32,7 @@
         "lib/decoders+proto_lib",
         "lib/imagereader+proto_lib",
         "lib/imagewriter+proto_lib",
+        "lib/external+fl2_proto_lib",
         "lib+drive_proto_lib",
     ],
 )

lib/core/utils.cc

@@ -1,8 +1,11 @@
 #include "lib/core/globals.h"
 #include "lib/core/utils.h"
 #include "lib/core/bytes.h"
+#include "lib/core/logger.h"
 #include <iomanip>
 #include <fstream>
+#include <sys/time.h>
+#include <stdarg.h>
 
 bool emergencyStop = false;
 
@@ -233,3 +236,17 @@ int findLowestSetBit(uint64_t value)
     }
     return bit;
 }
+
+double getCurrentTime(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+
+    return double(tv.tv_sec) + tv.tv_usec / 1000000.0;
+}
+
+void warning(const std::string msg)
+{
+    log(msg);
+}
+

lib/drive.proto

@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 import "lib/common.proto";
-import "lib/fl2.proto";
+import "lib/external/fl2.proto";
 
 // Next: 15
 message DriveProto

lib/a2r.h renamed to lib/external/a2r.h

@@ -0,0 +1,20 @@
+from build.c import cxxlibrary
+from build.protobuf import proto, protocc
+
+proto(name="fl2_proto", srcs=["./fl2.proto"])
+protocc(name="fl2_proto_lib", srcs=[".+fl2_proto"])
+
+cxxlibrary(
+    name="external",
+    srcs=[
+        "./ldbs.cc",
+        "./fl2.cc",
+    ],
+    hdrs={
+        "lib/external/ldbs.h": "./ldbs.h",
+        "lib/external/a2r.h": "./a2r.h",
+        "lib/external/scp.h": "./scp.h",
+        "lib/external/fl2.h": "./fl2.h",
+    },
+    deps=["lib/core", ".+fl2_proto_lib", "lib/data"],
+)

lib/external/build.py

@@ -1,7 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config/proto.h"
 #include "lib/data/fluxmap.h"
-#include "lib/fl2.pb.h"
+#include "lib/external/fl2.pb.h"
 #include <fstream>
 
 static void upgradeFluxFile(FluxFileProto& proto)

lib/fl2.cc renamed to lib/external/fl2.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include <string.h>
 #include "lib/core/bytes.h"
-#include "lib/ldbs.h"
+#include "lib/external/ldbs.h"
 
 LDBS::LDBS() {}
 

lib/fl2.h renamed to lib/external/fl2.h

@@ -10,7 +10,7 @@
 #include "lib/config/proto.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/layout.h"
-#include "lib/a2r.h"
+#include "lib/external/a2r.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/fl2.proto renamed to lib/external/fl2.proto

@@ -8,8 +8,8 @@
 #include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/config/proto.h"
-#include "lib/fl2.pb.h"
-#include "lib/fl2.h"
+#include "lib/external/fl2.pb.h"
+#include "lib/external/fl2.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/ldbs.cc renamed to lib/external/ldbs.cc

@@ -10,7 +10,7 @@
 #include "lib/config/proto.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/layout.h"
-#include "lib/scp.h"
+#include "lib/external/scp.h"
 #include "lib/core/logger.h"
 #include <fstream>
 #include <sys/stat.h>

lib/ldbs.h renamed to lib/external/ldbs.h

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

lib/scp.h renamed to lib/external/scp.h

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

lib/fluxsink/a2rfluxsink.cc

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

lib/fluxsink/fl2fluxsink.cc

@@ -2,7 +2,7 @@
 #include "lib/config/flags.h"
 #include "lib/data/sector.h"
 #include "lib/imagewriter/imagewriter.h"
-#include "lib/ldbs.h"
+#include "lib/external/ldbs.h"
 #include "lib/data/image.h"
 #include "lib/core/logger.h"
 #include "lib/config/config.pb.h"

lib/fluxsink/scpfluxsink.cc

@@ -2,7 +2,7 @@
 #include "lib/config/flags.h"
 #include "lib/data/sector.h"
 #include "lib/imagewriter/imagewriter.h"
-#include "lib/ldbs.h"
+#include "lib/external/ldbs.h"
 #include "lib/data/image.h"
 #include "lib/core/logger.h"
 #include "lib/config/config.pb.h"

lib/fluxsource/fl2fluxsource.cc

@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 import "lib/common.proto";
-import "lib/fl2.proto";
+import "lib/external/fl2.proto";
 
 message SectorListProto
 {

lib/fluxsource/scpfluxsource.cc

@@ -1,4 +1,4 @@
-#include "lib/globals.h"
+#include "lib/core/globals.h"
 #include "protocol.h"
 #include "lib/data/fluxmap.h"
 #include "lib/core/bytes.h"