Consolidate the Northstar formats into each other.

doc/disk-northstar.md

@@ -21,12 +21,10 @@ equivalent to .img images.
 Reading disks
 -------------
 
-You must use a 48-TPI (40-track) 300RPM 5.25" floppy drive.
-
 To read a double-sided North Star floppy, run:
 
 ```
-fluxengine read <format>
+fluxengine read northstar <format>
 ```
 
 ...where `<format>` is one of the formats listed below.
@@ -37,13 +35,10 @@ disk type.
 Writing disks
 -------------
 
-You must use a 48-TPI (40-track) 300RPM 5.25" floppy drive and make
-sure that the drive's spindle speed is adjusted to exactly 300RPM.
-
 To write a double-sided North Star floppy, run:
 
 ```
-fluxengine write <format> -i image_to_write.nsi
+fluxengine write northstar <format> -i image_to_write.nsi
 ```
 
 ...where `<format>` is one of the formats listed below.
@@ -55,9 +50,9 @@ The following formats are supported:
 
 | Format name    | Disk Type                           | File Size (bytes) |
 | -------------- | ----------------------------------- | ----------------- |
-| `northstar87`  | Single-Sided, Single-Density (SSSD) | 89,600            |
-| `northstar175` | Single-Sided, Double-Density (SSDD) | 179,200           |
-| `northstar350` | Double-Sided, Double-Density (DSDD) | 358,400           |
+| `--87`         | Single-Sided, Single-Density (SSSD) | 89,600            |
+| `--175`        | Single-Sided, Double-Density (SSDD) | 179,200           |
+| `--350`        | Double-Sided, Double-Density (DSDD) | 358,400           |
 
 Useful references
 -----------------

src/formats/_northstar.textpb

@@ -1,35 +0,0 @@
-comment: 'Northstar generic settings'
-is_extension: true
-
-image_reader {
-	filename: "northstar.nsi"
-	type: NSI
-}
-
-image_writer {
-	filename: "northstar.nsi"
-	type: NSI
-}
-
-layout {
-	layoutdata {
-		physical {
-			start_sector: 0
-			count: 10
-		}
-	}
-}
-
-drive {
-	hard_sector_count: 10
-	sync_with_index: true
-}
-
-encoder {
-	northstar {}
-}
-
-decoder {
-	northstar {}
-}
-

src/formats/build.mk

@@ -1,7 +1,6 @@
 FORMATS = \
 	_apple2 \
 	_atari \
-	_northstar \
 	_mx \
 	40track_drive \
 	acornadfs \
@@ -46,9 +45,7 @@ FORMATS = \
 	mx220_ss \
 	mx440 \
 	n88basic \
-	northstar175 \
-	northstar350 \
-	northstar87 \
+	northstar \
 	psos800 \
 	rolandd20 \
 	rx50 \

src/formats/northstar.textpb

@@ -0,0 +1,85 @@
+comment: 'Northstar family'
+
+image_reader {
+	filename: "northstar.nsi"
+	type: NSI
+}
+
+image_writer {
+	filename: "northstar.nsi"
+	type: NSI
+}
+
+layout {
+	layoutdata {
+		physical {
+			start_sector: 0
+			count: 10
+		}
+	}
+}
+
+drive {
+	hard_sector_count: 10
+	sync_with_index: true
+}
+
+encoder {
+	northstar {}
+}
+
+decoder {
+	northstar {}
+}
+
+tpi: 48
+
+option_group {
+	comment: "Format variant"
+
+	option {
+		name: "87"
+		comment: '87.5kB 5.25" 35-track SSSD hard-sectored'
+
+		config {
+			layout {
+				tracks: 40
+				sides: 1
+				layoutdata {
+					sector_size: 256
+				}
+			}
+		}
+	}
+
+	option {
+		name: "175"
+		comment: '175kB 5.25" 40-track SSDD hard-sectored'
+
+		config {
+			layout {
+				tracks: 40
+				sides: 1
+				layoutdata {
+					sector_size: 512
+				}
+			}
+		}
+	}
+
+	option {
+		name: "350"
+		comment: '350kB 5.25" 40-track DSDD hard-sectored'
+		set_by_default: true
+
+		config {
+			layout {
+				tracks: 40
+				sides: 2
+				layoutdata {
+					sector_size: 512
+				}
+			}
+		}
+	}
+}

src/formats/northstar175.textpb

@@ -1,12 +0,0 @@
-comment: 'Northstar 175kB 5.25" 35-track SSDD hard-sectored'
-
-include: '_northstar'
-
-layout {
-	tracks: 40
-	sides: 1
-	layoutdata {
-		sector_size: 512
-	}
-}
-

src/formats/northstar350.textpb

@@ -1,13 +0,0 @@
-comment: 'Northstar 350kB 5.25" 35-track SSDD hard-sectored'
-
-include: '_northstar'
-
-layout {
-	tracks: 40
-	sides: 2
-	layoutdata {
-		sector_size: 512
-	}
-}
-
-

src/formats/northstar87.textpb

@@ -1,13 +0,0 @@
-comment: 'Northstar 87.5kB 5.25" 35-track SSSD hard-sectored'
-
-include: '_northstar'
-
-layout {
-	tracks: 40
-	sides: 1
-	layoutdata {
-		sector_size: 256
-	}
-}
-
-