Convert all the readables to formats.

mkninja.sh

@@ -374,34 +374,13 @@ buildlibrary libbackend.a \
     lib/utils.cc \
     lib/writer.cc \
 
-READABLES="\
-    amiga \
-    "
-#    acornadfs \
-#    acorndfs \
-#    aeslanier \
-#    amiga \
-#    ampro \
-#    apple2 \
-#    atarist \
-#    brother \
-#    commodore1541 \
-#    commodore1581 \
-#    eco1 \
-#    f85 \
-#    fb100 \
-#    ibm \
-#    macintosh \
-#    micropolis \
-#    mx \
-#    northstar \
-#    tids990 \
-#    victor9k \
-#    zilogmcz \
-#    "
-
 FORMATS="\
+    acornadfs \
+    acorndfs \
+    aeslanier \
     amiga \
+    ampro \
+    apple2 \
     atarist360 \
     atarist370 \
     atarist400 \
@@ -414,7 +393,11 @@ FORMATS="\
     brother240 \
     commodore1541 \
     commodore1581 \
+    eco1 \
+    f85 \
+    fb100 \
     hplif770 \
+    ibm \
     ibm1200_525 \
     ibm1440 \
     ibm180_525 \
@@ -422,33 +405,29 @@ FORMATS="\
     ibm720 \
     ibm720_525 \
     macintosh \
+    micropolis \
+    mx \
     northstar87 \
     northstar175 \
     northstar350 \
     tids990 \
+    victor9k \
+    zilogmcz \
     "
 
-for pb in $READABLES; do
-    buildencodedproto $OBJDIR/proto/libconfig.def ConfigProto \
-        readables_${pb}_pb src/readables/$pb.textpb $OBJDIR/proto/src/readables/$pb.cc
-done
-
 for pb in $FORMATS; do
     buildencodedproto $OBJDIR/proto/libconfig.def ConfigProto \
         formats_${pb}_pb src/formats/$pb.textpb $OBJDIR/proto/src/formats/$pb.cc
 done
 
-buildmktable readables $OBJDIR/readables.cc $READABLES
-buildmktable writables $OBJDIR/writables.cc $WRITABLES
+buildmktable formats $OBJDIR/formats.cc $FORMATS
 
 buildlibrary libfrontend.a \
     -I$OBJDIR/proto \
     -d $OBJDIR/proto/libconfig.def \
     -d $OBJDIR/proto/libdata.def \
-    $(for a in $READABLES; do echo $OBJDIR/proto/src/readables/$a.cc; done) \
-    $(for a in $WRITABLES; do echo $OBJDIR/proto/src/writables/$a.cc; done) \
-    $OBJDIR/readables.cc \
-    $OBJDIR/writables.cc \
+    $(for a in $FORMATS; do echo $OBJDIR/proto/src/formats/$a.cc; done) \
+    $OBJDIR/formats.cc \
     src/fe-analysedriveresponse.cc \
     src/fe-analyselayout.cc \
     src/fe-inspect.cc \

src/fe-rawread.cc

@@ -60,8 +60,8 @@ int mainRawRead(int argc, const char* argv[])
 	setRange(config.mutable_heads(), "0-1");
 
 	if (argc == 1)
-		showProfiles("rawread", readables);
-    flags.parseFlagsWithConfigFiles(argc, argv, readables);
+		showProfiles("rawread", formats);
+    flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
 	if (config.flux_sink().has_drive())
 		Error() << "you can't use rawread to write to hardware";

src/fe-rawwrite.cc

@@ -64,8 +64,8 @@ int mainRawWrite(int argc, const char* argv[])
 	setRange(config.mutable_heads(), "0-1");
 
 	if (argc == 1)
-		showProfiles("rawwrite", writables);
-    flags.parseFlagsWithConfigFiles(argc, argv, writables);
+		showProfiles("rawwrite", formats);
+    flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
 	if (config.flux_source().has_drive())
 		Error() << "you can't use rawwrite to read from hardware";

src/fe-read.cc

@@ -66,8 +66,8 @@ static StringFlag srcHeads(
 int mainRead(int argc, const char* argv[])
 {
 	if (argc == 1)
-		showProfiles("read", readables);
-    flags.parseFlagsWithConfigFiles(argc, argv, readables);
+		showProfiles("read", formats);
+    flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
 	if (config.decoder().copy_flux_to().has_drive())
 		Error() << "you cannot copy flux to a hardware device";

src/fe-write.cc

@@ -56,8 +56,8 @@ static StringFlag destHeads(
 int mainWrite(int argc, const char* argv[])
 {
 	if (argc == 1)
-		showProfiles("write", writables);
-    flags.parseFlagsWithConfigFiles(argc, argv, writables);
+		showProfiles("write", formats);
+    flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
 	std::unique_ptr<ImageReader> reader(ImageReader::create(config.image_reader()));
 	std::unique_ptr<AbstractEncoder> encoder(AbstractEncoder::create(config.encoder()));

src/fluxengine.h

@@ -3,7 +3,6 @@
 
 extern void showProfiles(const std::string& command, const std::map<std::string, std::string>& profiles);
 
-extern const std::map<std::string, std::string> writables;
-extern const std::map<std::string, std::string> readables;
+extern const std::map<std::string, std::string> formats;
 
 #endif

src/formats/acornadfs.textpb

@@ -1,16 +1,8 @@
-comment: 'Acorn ADFS L/D/E/F 640kB/800kB/1600kB 3.5" or 5.25" 80-track double-sided'
+comment: 'Acorn ADFS L/D/E/F 640kB/800kB/1600kB 3.5" or 5.25" 80-track DS (ro)'
 
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "acornadfs.img"
-		img {}
-	}
+image_writer {
+	filename: "acornadfs.img"
+	img {}
 }
 
 decoder {

src/formats/acorndfs.textpb

@@ -0,0 +1,24 @@
+comment: 'Acorn DFS 100kB/200kB 3.5" or 5.25" 40- or 80-track SS (ro)'
+
+image_writer {
+	filename: "acorndfs.img"
+	img {}
+}
+
+decoder {
+	ibm {
+		sector_id_base: 0
+	}
+}
+
+cylinders {
+	start: 0
+	end: 79
+}
+
+heads {
+	start: 0
+	end: 0
+}
+
+

src/formats/aeslanier.textpb

@@ -0,0 +1,22 @@
+comment: 'AES Lanier "No Problem" 616kB 5.25" 77-track SSDD hard sectored (ro)'
+
+image_writer {
+	filename: "aeslanier.img"
+	img {}
+}
+
+decoder {
+	aeslanier {}
+}
+
+cylinders {
+	start: 0
+	end: 76
+}
+
+heads {
+	start: 0
+	end: 0
+}
+
+

src/formats/amiga.textpb

@@ -1,4 +1,4 @@
-comment: 'Amiga 880kB 3.5" double sided'
+comment: 'Amiga 880kB 3.5" DSDD'
 
 image_reader {
 	filename: "amiga.adf"

src/formats/ampro.textpb

@@ -0,0 +1,24 @@
+comment: 'Ampro 400kB/800kB 5.25" 40/80 track SSDD/DSDD (ro)'
+
+image_writer {
+	filename: "ampro.img"
+	img {}
+}
+
+decoder {
+	ibm {
+		sector_id_base: 17
+	}
+}
+
+cylinders {
+	start: 0
+	end: 79
+}
+
+heads {
+	start: 0
+	end: 0
+}
+
+

src/formats/apple2.textpb

@@ -0,0 +1,22 @@
+comment: 'Apple II 140kB DOS 3.3 5.25" 40 track SSSD (ro)'
+
+image_writer {
+	filename: "apple2.img"
+	img {}
+}
+
+decoder {
+	apple2 {}
+}
+
+cylinders {
+	start: 0
+	end: 79
+	step: 2
+}
+
+heads {
+	start: 0
+	end: 0
+}
+

src/formats/atarist360.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 360kB 3.5" 80-track 9-sector single sided'
+comment: 'Atari ST 360kB 3.5" 80-track 9-sector SSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist360.st"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist360.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/atarist370.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 370kB 3.5" 82-track 9-sector single sided'
+comment: 'Atari ST 370kB 3.5" 82-track 9-sector SSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist370.st"
 	img {
 		tracks: 82
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist370.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 81

src/formats/atarist400.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 400kB 3.5" 80-track 10-sector single sided'
+comment: 'Atari ST 400kB 3.5" 80-track 10-sector SSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist400.st"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist400.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/atarist410.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 410kB 3.5" 82-track 10-sector single sided'
+comment: 'Atari ST 410kB 3.5" 82-track 10-sector SSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist410.st"
 	img {
 		tracks: 82
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist410.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 81

src/formats/atarist720.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 720kB 3.5" 80-track 9-sector double sided'
+comment: 'Atari ST 720kB 3.5" 80-track 9-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist720.st"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist720.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/atarist740.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 740kB 3.5" 82-track 9-sector double sided'
+comment: 'Atari ST 740kB 3.5" 82-track 9-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist740.st"
 	img {
 		tracks: 82
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist740.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 81

src/formats/atarist800.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 800kB 3.5" 80-track 10-sector double sided'
+comment: 'Atari ST 800kB 3.5" 80-track 10-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist800.st"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist800.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/atarist820.textpb

@@ -1,6 +1,6 @@
-comment: 'Atari ST 820kB 3.5" 82-track 10-sector double sided'
+comment: 'Atari ST 820kB 3.5" 82-track 10-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "atarist820.st"
 	img {
 		tracks: 82
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "atarist820.st"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -27,6 +32,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 81

src/formats/brother120.textpb

@@ -1,6 +1,6 @@
-comment: 'Brother 120kB 3.5" 39-track GCR disks'
+comment: 'Brother 120kB 3.5" 39-track SS GCR'
 
-image_writer {
+image_reader {
 	filename: "brother120.img"
 	img {
 		tracks: 39
@@ -12,12 +12,21 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "brother120.img"
+	img {}
+}
+
 encoder {
 	brother {
 		format: BROTHER120
 	}
 }
 
+decoder {
+	brother {}
+}
+
 cylinders {
 	start: 0
 	end: 39

src/formats/brother240.textpb

@@ -1,6 +1,6 @@
-comment: 'Brother 240kB 3.5" 78-track GCR disks'
+comment: 'Brother 240kB 3.5" 78-track SS GCR'
 
-image_writer {
+image_reader {
 	filename: "brother240.img"
 	img {
 		tracks: 78
@@ -12,10 +12,19 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "brother240.img"
+	img {}
+}
+
 encoder {
 	brother {}
 }
 
+decoder {
+	brother {}
+}
+
 cylinders {
 	start: 0
 	end: 77

src/formats/commodore1541.textpb

@@ -1,4 +1,9 @@
-comment: 'Commodore 1541 170kB 5.25" GCR disks'
+comment: 'Commodore 1541 170kB 5.25" SS GCR'
+
+image_reader {
+	filename: "commodore1541.img"
+	d64 {}
+}
 
 image_writer {
 	filename: "commodore1541.img"
@@ -9,6 +14,10 @@ encoder {
 	c64 {}
 }
 
+decoder {
+	c64 {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/commodore1581.textpb

@@ -1,4 +1,16 @@
-comment: 'Commodore 1581 800kB 3.5" MFM disks'
+comment: 'Commodore 1581 800kB 3.5" DSDD'
+
+image_reader {
+	filename: "commodore1581.d81"
+	img {
+		tracks: 80
+		sides: 2
+		trackdata {
+			sectors: 10
+			sector_size: 512
+		}
+	}
+}
 
 image_writer {
 	filename: "commodore1581.d81"
@@ -27,6 +39,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/eco1.textpb

@@ -0,0 +1,41 @@
+comment: 'VDS Eco1 1210kB 77-track mixed format DSHD (ro)'
+
+image_writer {
+	filename: "eco1.img"
+	img {
+		tracks: 77
+		sides: 2
+		trackdata {
+			sectors: 16
+			sector_size: 512
+		}
+		trackdata {
+			track: 0
+			side: 0
+			sectors: 26
+			sector_size: 128
+		}
+		trackdata {
+			track: 0
+			side: 1
+			sectors: 26
+			sector_size: 256
+		}
+	}
+}
+
+decoder {
+	ibm {}
+}
+
+cylinders {
+	start: 0
+	end: 76
+}
+
+heads {
+	start: 0
+	end: 1
+}
+
+

src/formats/f85.textpb

@@ -0,0 +1,21 @@
+comment: 'Durango F85 461kB 5.25" 77-track SS (ro)'
+
+image_writer {
+	filename: "f85.img"
+	img {}
+}
+
+decoder {
+	f85 {}
+}
+
+cylinders {
+	start: 0
+	end: 79
+}
+
+heads {
+	start: 0
+	end: 0
+}
+

src/formats/fb100.textpb

@@ -0,0 +1,23 @@
+comment: 'Brother FB-100 100kB 3.5" 40-track SS (ro)'
+
+image_writer {
+	filename: "fb100.img"
+	img {}
+}
+
+decoder {
+	fb100 {}
+}
+
+cylinders {
+	start: 0
+	end: 79
+	step: 2
+}
+
+heads {
+	start: 0
+	end: 0
+}
+
+

src/formats/hplif770.textpb

@@ -1,6 +1,6 @@
-comment: 'Hewlett-Packard LIF 770kB 3.5" disks'
+comment: 'Hewlett-Packard LIF 770kB 3.5" DSDD'
 
-image_writer {
+image_reader {
 	filename: "hplif770.img"
 	img {
 		tracks: 77

src/formats/ibm.textpb

@@ -0,0 +1,22 @@
+comment: 'PC 3.5"/5.25" autodetect double sided format (ro)'
+
+image_writer {
+	filename: "ibm.img"
+	img {}
+}
+
+decoder {
+	ibm {}
+}
+
+cylinders {
+	start: 0
+	end: 81
+}
+
+heads {
+	start: 0
+	end: 1
+}
+
+

src/formats/ibm1200_525.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 1200kB 5.25" 80-track 15-sector double-sided'
+comment: 'PC 1200kB 5.25" 80-track 15-sector DSHD'
 
-image_writer {
+image_reader {
 	filename: "ibm1200_525.img"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm1200_525.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -22,6 +27,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/ibm1440.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 1440kB 3.5" 80-track 18-sector double-sided'
+comment: 'PC 1440kB 3.5" 80-track 18-sector DSHD'
 
-image_writer {
+image_reader {
 	filename: "ibm1440.img"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm1440.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -22,6 +27,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/ibm180_525.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 180kB 5.25" 40-track 9-sector single-sided'
+comment: 'PC 180kB 5.25" 40-track 9-sector SSDD'
 
-image_writer {
+image_reader {
 	filename: "ibm180_525.img"
 	img {
 		tracks: 40
@@ -13,6 +13,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm180_525.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -23,6 +28,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/ibm360_525.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 360kB 5.25" 40-track 9-sector double-sided'
+comment: 'PC 360kB 5.25" 40-track 9-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "ibm360_525.img"
 	img {
 		tracks: 40
@@ -13,6 +13,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm360_525.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -23,6 +28,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/ibm720.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 720kB 3.5" 80-track 9-sector double-sided'
+comment: 'PC 720kB 3.5" 80-track 9-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "ibm720.img"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm720.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -22,6 +27,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/ibm720_525.textpb

@@ -1,6 +1,6 @@
-comment: 'PC 720kB 5.25" 80-track 9-sector double-sided'
+comment: 'PC 720kB 5.25" 80-track 9-sector DSDD'
 
-image_writer {
+image_reader {
 	filename: "ibm720_525.img"
 	img {
 		tracks: 80
@@ -12,6 +12,11 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "ibm720_525.img"
+	img {}
+}
+
 encoder {
 	ibm {
 		trackdata {
@@ -22,6 +27,10 @@ encoder {
 	}
 }
 
+decoder {
+	ibm {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/macintosh.textpb

@@ -1,4 +1,9 @@
-comment: 'Macintosh 800kB 3.5" GCR double-sided'
+comment: 'Macintosh 800kB 3.5" DSDD GCR'
+
+image_reader {
+	filename: "macintosh.diskcopy"
+	diskcopy {}
+}
 
 image_writer {
 	filename: "macintosh.diskcopy"
@@ -9,6 +14,10 @@ encoder {
 	macintosh {}
 }
 
+decoder {
+	macintosh {}
+}
+
 cylinders {
 	start: 0
 	end: 79

src/formats/micropolis.textpb

@@ -0,0 +1,27 @@
+comment: 'Micropolis MetaFloppy 630kB 5.25" DSDD hard-sectored (ro)'
+
+flux_source {
+	drive {
+		hard_sector_count: 16
+	}
+}
+
+image_writer {
+	filename: "micropolis.img"
+	img {}
+}
+
+decoder {
+	micropolis {}
+}
+
+cylinders {
+	start: 0
+	end: 76
+}
+
+heads {
+	start: 0
+	end: 1
+}
+

src/formats/mx.textpb

@@ -0,0 +1,21 @@
+comment: 'DVK MX 110kB/220kB/440kB 5.25" (ro)'
+
+image_writer {
+	filename: "mx.img"
+	img {}
+}
+
+decoder {
+	mx {}
+}
+
+cylinders {
+	start: 0
+	end: 79
+}
+
+heads {
+	start: 0
+	end: 1
+}
+

src/formats/northstar175.textpb

@@ -1,10 +1,22 @@
-comment: 'Northstar 175kB 5.25" 35-track single-sided double-density hard-sectored'
+comment: 'Northstar 175kB 5.25" 35-track SSDD hard-sectored'
+
+image_reader {
+	filename: "northstar.nsi"
+	nsi {}
+}
 
 image_writer {
 	filename: "northstar.nsi"
 	nsi {}
 }
 
+flux_source {
+	drive {
+		hard_sector_count: 10
+		sync_with_index: 1
+	}
+}
+
 flux_sink {
 	drive {
 		hard_sector_count: 10
@@ -15,6 +27,10 @@ encoder {
 	northstar {}
 }
 
+decoder {
+	northstar {}
+}
+
 cylinders {
 	start: 0
 	end: 39

src/formats/northstar350.textpb

@@ -1,10 +1,22 @@
-comment: 'Northstar 350kB 5.25" 35-track double-sided double-density hard-sectored'
+comment: 'Northstar 350kB 5.25" 35-track SSDD hard-sectored'
+
+image_reader {
+	filename: "northstar.nsi"
+	nsi {}
+}
 
 image_writer {
 	filename: "northstar.nsi"
 	nsi {}
 }
 
+flux_source {
+	drive {
+		hard_sector_count: 10
+		sync_with_index: 1
+	}
+}
+
 flux_sink {
 	drive {
 		hard_sector_count: 10
@@ -15,6 +27,10 @@ encoder {
 	northstar {}
 }
 
+decoder {
+	northstar {}
+}
+
 cylinders {
 	start: 0
 	end: 39

src/formats/northstar87.textpb

@@ -1,10 +1,22 @@
-comment: 'Northstar 87.5kB 5.25" 35-track single-sided single-density hard-sectored'
+comment: 'Northstar 87.5kB 5.25" 35-track SSSD hard-sectored'
+
+image_reader {
+	filename: "northstar.nsi"
+	nsi {}
+}
 
 image_writer {
 	filename: "northstar.nsi"
 	nsi {}
 }
 
+flux_source {
+	drive {
+		hard_sector_count: 10
+		sync_with_index: 1
+	}
+}
+
 flux_sink {
 	drive {
 		hard_sector_count: 10
@@ -15,6 +27,10 @@ encoder {
 	northstar {}
 }
 
+decoder {
+	northstar {}
+}
+
 cylinders {
 	start: 0
 	end: 39

src/formats/tids990.textpb

@@ -1,6 +1,6 @@
-comment: 'Texas Instruments DS990 1126kB 8" double-sided'
+comment: 'Texas Instruments DS990 1126kB 8" DSSD'
 
-image_writer {
+image_reader {
 	filename: "tids990.img"
 	img {
 		tracks: 77
@@ -12,10 +12,19 @@ image_writer {
 	}
 }
 
+image_writer {
+	filename: "tids990.img"
+	img {}
+}
+
 encoder {
 	tids990 {}
 }
 
+decoder {
+	tids990 {}
+}
+
 cylinders {
 	start: 0
 	end: 76

src/formats/victor9k.textpb

@@ -0,0 +1,21 @@
+comment: 'Victor 9000 / Sirius One 1224kB SSHD GCR variable sector (ro)'
+
+image_writer {
+	filename: "victor9k.img"
+	img {}
+}
+
+decoder {
+	victor9k {}
+}
+
+cylinders {
+	start: 0
+	end: 79
+}
+
+heads {
+	start: 0
+	end: 0
+}
+

src/formats/zilogmcz.textpb

@@ -0,0 +1,21 @@
+comment: 'Zilog MCZ 320kB 8" 77-track SS hard-sectored (ro)'
+
+image_writer {
+	filename: "zilogmcz.img"
+	img {}
+}
+
+decoder {
+	zilogmcz {}
+}
+
+cylinders {
+	start: 0
+	end: 76
+}
+
+heads {
+	start: 0
+	end: 0
+}
+

src/readables/acorndfs.textpb

@@ -1,32 +0,0 @@
-comment: 'Acorn DFS 100kB/200kB 3.5" or 5.25" 40- or 80-track singled sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "acorndfs.img"
-		img {}
-	}
-}
-
-decoder {
-	ibm {
-		sector_id_base: 0
-	}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 0
-}
-
-

src/readables/aeslanier.textpb

@@ -1,30 +0,0 @@
-comment: 'AES Lanier "No Problem" 616kB 5.25" 77-track single sided hard sectored'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "aeslanier.img"
-		img {}
-	}
-}
-
-decoder {
-	aeslanier {}
-}
-
-cylinders {
-	start: 0
-	end: 76
-}
-
-heads {
-	start: 0
-	end: 0
-}
-
-

src/readables/amiga.textpb

@@ -1,34 +0,0 @@
-comment: 'Amiga 880kB 3.5" double sided'
-
-flux_source {
-	drive {}
-}
-
-image_writer {
-	filename: "amiga.adf"
-	img {
-		tracks: 80
-		sides: 2
-		trackdata {
-			sector_size: 512
-			sectors: 11
-		}
-	}
-}
-
-decoder {
-	amiga {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-
-

src/readables/ampro.textpb

@@ -1,32 +0,0 @@
-comment: 'Ampro 400kB/800kB 5.25" 40/80 track double sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "ampro.img"
-		img {}
-	}
-}
-
-decoder {
-	ibm {
-		sector_id_base: 17
-	}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 0
-}
-
-

src/readables/apple2.textpb

@@ -1,30 +0,0 @@
-comment: 'Apple II 140kB DOS 3.3 5.25" 40 track single sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "apple2.img"
-		img {}
-	}
-}
-
-decoder {
-	apple2 {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-	step: 2
-}
-
-heads {
-	start: 0
-	end: 0
-}
-

src/readables/atarist.textpb

@@ -1,30 +0,0 @@
-comment: 'Atari ST any 3.5" double sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "atarist.st"
-		img {}
-	}
-}
-
-decoder {
-	ibm {}
-}
-
-cylinders {
-	start: 0
-	end: 81
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-

src/readables/brother.textpb

@@ -1,28 +0,0 @@
-comment: 'Brother 120kB/240kB 3.5" GCR'
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "brother.img"
-		img {}
-	}
-}
-
-decoder {
-	brother {}
-}
-
-cylinders {
-	start: 0
-	end: 81
-}
-
-heads {
-	start: 0
-	end: 0
-}
-

src/readables/commodore1541.textpb

@@ -1,31 +0,0 @@
-comment: 'Commodore 1541 170kB 5.25" GCR disks'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "commodore1541.d64"
-		d64 {}
-	}
-}
-
-decoder {
-	c64 {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-	step: 2
-}
-
-heads {
-	start: 0
-	end: 0
-}
-
-

src/readables/commodore1581.textpb

@@ -1,37 +0,0 @@
-comment: 'Commodore 1581 800kB 3.5" MFM disks'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "commodore1581.d81"
-		img {
-			tracks: 80
-			sides: 2
-			trackdata {
-				sectors: 10
-				sector_size: 512
-			}
-		}
-	}
-}
-
-decoder {
-	ibm {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-

src/readables/eco1.textpb

@@ -1,49 +0,0 @@
-comment: 'VDS Eco1 1210kB 77-track mixed format double sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "eco1.img"
-		img {
-			tracks: 77
-			sides: 2
-			trackdata {
-				sectors: 16
-				sector_size: 512
-			}
-			trackdata {
-				track: 0
-				side: 0
-				sectors: 26
-				sector_size: 128
-			}
-			trackdata {
-				track: 0
-				side: 1
-				sectors: 26
-				sector_size: 256
-			}
-		}
-	}
-}
-
-decoder {
-	ibm {}
-}
-
-cylinders {
-	start: 0
-	end: 76
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-

src/readables/f85.textpb

@@ -1,29 +0,0 @@
-comment: 'Durango F85 461kB 5.25" 77-track single sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "f85.img"
-		img {}
-	}
-}
-
-decoder {
-	f85 {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 0
-}
-

src/readables/fb100.textpb

@@ -1,31 +0,0 @@
-comment: 'Brother FB-100 100kB 3.5" 40-track single-sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "fb100.img"
-		img {}
-	}
-}
-
-decoder {
-	fb100 {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-	step: 2
-}
-
-heads {
-	start: 0
-	end: 0
-}
-
-

src/readables/ibm.textpb

@@ -1,30 +0,0 @@
-comment: 'PC 3.5"/5.25" any double sided format'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "ibm.img"
-		img {}
-	}
-}
-
-decoder {
-	ibm {}
-}
-
-cylinders {
-	start: 0
-	end: 81
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-

src/readables/macintosh.textpb

@@ -1,29 +0,0 @@
-comment: 'Macintosh 800kB 3.5" GCR double-sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "macintosh.diskcopy"
-		diskcopy {}
-	}
-}
-
-decoder {
-	macintosh {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 1
-}
-

src/readables/micropolis.textpb

@@ -1,31 +0,0 @@
-comment: 'Micropolis MetaFloppy 630kB 5.25" double-sided hard-sectored'
-
-input {
-	flux {
-		drive {
-			hard_sector_count: 16
-		}
-	}
-}
-
-output {
-	image {
-		filename: "micropolis.img"
-		img {}
-	}
-}
-
-decoder {
-	micropolis {}
-}
-
-cylinders {
-	start: 0
-	end: 76
-}
-
-heads {
-	start: 0
-	end: 1
-}
-

src/readables/mx.textpb

@@ -1,29 +0,0 @@
-comment: 'DVK MX 110kB/220kB/440kB 5.25"'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "mx.img"
-		img {}
-	}
-}
-
-decoder {
-	mx {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 1
-}
-

src/readables/northstar.textpb

@@ -1,32 +0,0 @@
-comment: 'Northstar 87kB/175kB/350kB 5.25" 35-track 10-sector hard sectored'
-
-input {
-	flux {
-		drive {
-			hard_sector_count: 10
-			sync_with_index: 1
-		}
-	}
-}
-
-output {
-	image {
-		filename: "northstar.nsi"
-		nsi {}
-	}
-}
-
-decoder {
-	northstar {}
-}
-
-cylinders {
-	start: 0
-	end: 34
-}
-
-heads {
-	start: 0
-	end: 1
-}
-

src/readables/tids990.textpb

@@ -1,30 +0,0 @@
-comment: 'Texas Instruments DS990 1126kB 8" double-sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "tids990.img"
-		img {}
-	}
-}
-
-decoder {
-	tids990 {}
-}
-
-cylinders {
-	start: 0
-	end: 76
-}
-
-heads {
-	start: 0
-	end: 1
-}
-
-

src/readables/victor9k.textpb

@@ -1,29 +0,0 @@
-comment: 'Victor 9000 / Sirius One 1224kB GCR variable sector double-sided'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "victor9k.img"
-		img {}
-	}
-}
-
-decoder {
-	victor9k {}
-}
-
-cylinders {
-	start: 0
-	end: 79
-}
-
-heads {
-	start: 0
-	end: 0
-}
-

src/readables/zilogmcz.textpb

@@ -1,29 +0,0 @@
-comment: 'Zilog MCZ 320kB 8" 77-track single-sided hard-sectored'
-
-input {
-	flux {
-		drive {}
-	}
-}
-
-output {
-	image {
-		filename: "zilogmcz.img"
-		img {}
-	}
-}
-
-decoder {
-	zilogmcz {}
-}
-
-cylinders {
-	start: 0
-	end: 76
-}
-
-heads {
-	start: 0
-	end: 0
-}
-