Consolidate the Brother formats.

Makefile

@@ -187,8 +187,8 @@ $(call do-encodedecodetest,atarist,,--740)
 $(call do-encodedecodetest,atarist,,--800)
 $(call do-encodedecodetest,atarist,,--820)
 $(call do-encodedecodetest,bk800)
-$(call do-encodedecodetest,brother120)
-$(call do-encodedecodetest,brother240)
+$(call do-encodedecodetest,brother,,--120)
+$(call do-encodedecodetest,brother,,--240)
 $(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--35)
 $(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--40)
 $(call do-encodedecodetest,commodore1581)

doc/disk-brother.md

@@ -38,10 +38,10 @@ Reading disks
 Just do:
 
 ```
-fluxengine read `<format>`
+fluxengine read brother `<format>`
 ```
 
-... where `<format>` can be `brother120` or `brother240`. You should end up
+... where `<format>` can be `--120` or `--240`. You should end up
 with a `brother.img` which is either 119808 or 239616 bytes long.
 
 Writing disks
@@ -53,7 +53,7 @@ Just do:
 fluxengine write `<format>` -i brother.img
 ```
 
-...where `<format>` can be `brother120` or `brother240`.
+...where `<format>` can be `--120` or `--240`.
 
 Dealing with misaligned disks
 -----------------------------
@@ -102,7 +102,8 @@ record.) The sector order is 05a3816b4927, which gives a sector skew of 5.
 High level format
 -----------------
 
-Once decoded, you end up with a file system image.
+Once decoded, you end up with a file system image. FluxEngine supports direct
+filesystem access for both kinds of disks.
 
 ### 120kB disks
 

src/formats/brother.textpb

@@ -0,0 +1,91 @@
+comment: 'Brother GCR family'
+
+image_reader {
+	filename: "brother.img"
+	type: IMG
+}
+
+image_writer {
+	filename: "brother.img"
+	type: IMG
+}
+
+encoder {
+	brother {}
+}
+
+decoder {
+	brother {}
+}
+
+option_group {
+	comment: "Format variant"
+
+	option {
+		name: "120"
+		comment: '120kB 3.5" 39-track SS GCR'
+
+		config {
+			layout {
+				tracks: 39
+				sides: 1
+				layoutdata {
+					sector_size: 256
+					physical {
+						start_sector: 0
+						count: 12
+						skew: 5
+					}
+				}
+			}
+
+			encoder {
+				brother {
+					format: BROTHER120
+				}
+			}
+
+			drive {
+				head_bias: 0
+				group_offset: 1
+			}
+
+			filesystem {
+				type: BROTHER120
+			}
+
+			tpi: 48
+		}
+	}
+
+	option {
+		name: "240"
+		comment: '240kB 3.5" 78-track SS GCR'
+
+		config {
+			layout {
+				tracks: 78
+				sides: 1
+				layoutdata {
+					sector_size: 256
+					physical {
+						start_sector: 0
+						count: 12
+						skew: 5
+					}
+				}
+			}
+
+			drive {
+				head_bias: 3
+			}
+
+			filesystem {
+				type: FATFS
+			}
+
+			tpi: 96
+		}
+	}
+}
+

src/formats/brother120.textpb

@@ -1,46 +0,0 @@
-comment: 'Brother 120kB 3.5" 39-track SS GCR'
-
-image_reader {
-	filename: "brother120.img"
-	type: IMG
-}
-
-image_writer {
-	filename: "brother120.img"
-	type: IMG
-}
-
-layout {
-	tracks: 39
-	sides: 1
-	layoutdata {
-		sector_size: 256
-		physical {
-			start_sector: 0
-			count: 12
-			skew: 5
-		}
-	}
-}
-
-encoder {
-	brother {
-		format: BROTHER120
-	}
-}
-
-decoder {
-	brother {}
-}
-
-drive {
-	head_bias: 0
-	group_offset: 1
-}
-
-tpi: 48
-
-filesystem {
-	type: BROTHER120
-}
-

src/formats/brother240.textpb

@@ -1,41 +0,0 @@
-comment: 'Brother 240kB 3.5" 78-track SS GCR'
-
-image_reader {
-	filename: "brother240.img"
-	type: IMG
-}
-
-image_writer {
-	filename: "brother240.img"
-	type: IMG
-}
-
-layout {
-	tracks: 78
-	sides: 1
-	layoutdata {
-		sector_size: 256
-		physical {
-			start_sector: 0
-			count: 12
-			skew: 5
-		}
-	}
-}
-
-encoder {
-	brother {}
-}
-
-decoder {
-	brother {}
-}
-
-drive {
-	head_bias: 3
-}
-
-filesystem {
-	type: FATFS
-}
-

src/formats/build.mk

@@ -11,8 +11,7 @@ FORMATS = \
 	apple2 \
 	atarist \
 	bk800 \
-	brother120 \
-	brother240 \
+	brother \
 	commodore1541 \
 	commodore1581 \
 	cmd_fd2000 \