Merge from master.

mkninja.sh

@@ -205,6 +205,7 @@ buildlibrary libfrontend.a \
     src/fe-readfb100.cc \
     src/fe-readibm.cc \
     src/fe-readmac.cc \
+    src/fe-readmicrobee.cc \
     src/fe-readmx.cc \
     src/fe-readvictor9k.cc \
     src/fe-readzilogmcz.cc \

src/fe-readmicrobee.cc

@@ -0,0 +1,30 @@
+#include "globals.h"
+#include "flags.h"
+#include "reader.h"
+#include "fluxmap.h"
+#include "decoders/decoders.h"
+#include "image.h"
+#include "sector.h"
+#include "sectorset.h"
+#include "record.h"
+#include "ibm/ibm.h"
+#include "fmt/format.h"
+
+static FlagGroup flags { &readerFlags };
+
+static IntFlag sectorIdBase(
+	{ "--sector-id-base" },
+	"Sector ID of the first sector.",
+	0);
+
+int mainReadMicrobee(int argc, const char* argv[])
+{
+	setReaderDefaultSource(":t=0-79:s=0-1");
+	setReaderDefaultOutput("adfs.img");
+    flags.parseFlags(argc, argv);
+
+	IbmDecoder decoder(sectorIdBase);
+	readDiskCommand(decoder);
+    return 0;
+}
+

src/fluxengine.cc

@@ -21,6 +21,7 @@ extern command_cb mainReadF85;
 extern command_cb mainReadFB100;
 extern command_cb mainReadIBM;
 extern command_cb mainReadMac;
+extern command_cb mainReadMicrobee;
 extern command_cb mainReadMx;
 extern command_cb mainReadVictor9K;
 extern command_cb mainReadZilogMCZ;
@@ -72,6 +73,7 @@ static std::vector<Command> readables =
     { "fb100",         mainReadFB100,     "Reads FB100 disks.", },
     { "ibm",           mainReadIBM,       "Reads the ubiquitous IBM format disks.", },
     { "mac",           mainReadMac,       "Reads Apple Macintosh disks.", },
+    { "microbee",      mainReadMicrobee,  "Reads Microbee disks.", },
     { "mx",            mainReadMx,        "Reads MX disks.", },
     { "victor9k",      mainReadVictor9K,  "Reads Victor 9000 disks.", },
     { "zilogmcz",      mainReadZilogMCZ,  "Reads Zilog MCZ disks.", },