Convert the AES Lanier decoder to the new configuration system.

arch/aeslanier/aeslanier.proto

@@ -0,0 +1,4 @@
+syntax = "proto2";
+
+message AesLanierInputProto {}
+

lib/decoders/decoders.proto

@@ -2,6 +2,7 @@ syntax = "proto2";
 
 import "arch/brother/brother.proto";
 import "arch/ibm/ibm.proto";
+import "arch/aeslanier/aeslanier.proto";
 
 message DecoderProto {
 	optional double pulse_debounce_threshold = 1 [default = 0.30];
@@ -12,6 +13,7 @@ message DecoderProto {
 	oneof format {
 		IBMInputProto ibm = 5;
 		BrotherInputProto brother = 6;
+		AesLanierInputProto aeslanier = 7;
 	}
 }
 

mkninja.sh

@@ -246,6 +246,7 @@ buildlibrary libfmt.a \
     dep/fmt/posix.cc \
 
 buildproto libproto.a \
+    arch/aeslanier/aeslanier.proto \
     arch/brother/brother.proto \
     arch/ibm/ibm.proto \
     lib/common.proto \
@@ -324,6 +325,7 @@ buildlibrary libbackend.a \
     lib/writer.cc \
 
 READABLES="\
+    aeslanier \
     acornadfs \
     acorndfs \
     brother \
@@ -374,7 +376,6 @@ buildlibrary libfrontend.a \
     src/fe-writeflux.cc \
     src/fluxengine.cc \
 
-#    src/fe-readaeslanier.cc \
 #    src/fe-readamiga.cc \
 #    src/fe-readampro.cc \
 #    src/fe-readapple2.cc \

src/fe-readaeslanier.cc

@@ -1,25 +0,0 @@
-#include "globals.h"
-#include "flags.h"
-#include "reader.h"
-#include "fluxmap.h"
-#include "decoders/decoders.h"
-#include "sector.h"
-#include "sectorset.h"
-#include "record.h"
-#include "aeslanier/aeslanier.h"
-#include "fmt/format.h"
-
-static FlagGroup flags { &readerFlags };
-
-int mainReadAESLanier(int argc, const char* argv[])
-{
-	setReaderDefaultSource(":t=0-79:s=0");
-	setReaderDefaultOutput("aeslanier.img");
-    setReaderRevolutions(2);
-    flags.parseFlags(argc, argv);
-
-	AesLanierDecoder decoder;
-	readDiskCommand(decoder);
-    return 0;
-}
-