Consolidate all the Acorn formats together.

src/formats/_acornadfs32.textpb

@@ -1,26 +0,0 @@
-comment: 'Acorn ADFS generic settings (32-bit formats)'
-is_extension: true
-
-image_writer {
-	filename: "acornadfs.img"
-	type: IMG
-}
-
-layout {
-	tracks: 80
-	sides: 2
-	layoutdata {
-		sector_size: 1024
-		physical {
-			start_sector: 0
-		}
-	}
-}
-
-decoder {
-	ibm {
-		trackdata {
-			ignore_side_byte: true
-		}
-	}
-}

src/formats/_acornadfs8.textpb

@@ -1,25 +0,0 @@
-comment: 'Acorn ADFS generic settings (8-bit formats)'
-is_extension: true
-
-image_writer {
-	filename: "acornadfs.img"
-	type: IMG
-}
-
-layout {
-	layoutdata {
-		sector_size: 256
-		physical {
-			start_sector: 0
-			count: 16
-		}
-	}
-}
-
-decoder {
-	ibm {
-		trackdata {
-			ignore_side_byte: true
-		}
-	}
-}

src/formats/acornadfs160.textpb

@@ -1,9 +0,0 @@
-comment: 'Acorn ADFS S-format 160kB 3.5" or 5.25" 40-track SS'
-include: '_acornadfs8'
-
-layout {
-	tracks: 40
-	sides: 1
-}
-
-tpi: 48

src/formats/acornadfs1600.textpb

@@ -1,10 +0,0 @@
-comment: 'Acorn ADFS F-format 1600kB 3.5" 80-track DS'
-include: '_acornadfs32'
-
-layout {
-	layoutdata {
-		physical {
-			count: 10
-		}
-	}
-}

src/formats/acornadfs320.textpb

@@ -1,7 +0,0 @@
-comment: 'Acorn ADFS M-format 320kB 3.5" or 5.25" 80-track SS'
-include: '_acornadfs8'
-
-layout {
-	tracks: 80
-	sides: 1
-}

src/formats/acornadfs640.textpb

@@ -1,7 +0,0 @@
-comment: 'Acorn ADFS L-format 640kB 3.5" or 5.25" 80-track DS'
-include: '_acornadfs8'
-
-layout {
-	tracks: 80
-	sides: 2
-}

src/formats/acornadfs800.textpb

@@ -1,10 +0,0 @@
-comment: 'Acorn ADFS D and E-format 800kB 3.5" 80-track DS'
-include: '_acornadfs32'
-
-layout {
-	layoutdata {
-		physical {
-			count: 5
-		}
-	}
-}

src/formats/acorndfs.textpb

@@ -1,4 +1,4 @@
-comment: 'Acorn DFS 100kB/200kB 3.5" or 5.25" 40- or 80-track SS (ro)'
+comment: 'Acorn DFS fmaily'
 
 image_reader {
 	filename: "acorndfs.img"
@@ -51,7 +51,7 @@ option_group {
 
 	option {
 		name: "100"
-		comment: "40-track 100kB"
+		comment: '100kB 40-track SSSD'
 
 		config {
 			layout {
@@ -62,7 +62,7 @@ option_group {
 
 	option {
 		name: "200"
-		comment: "80-track 200kB"
+		comment: '200kB 80-track SSSD'
 		set_by_default: true
 
 		config {

src/formats/build.mk

@@ -1,17 +1,11 @@
 FORMATS = \
-	_acornadfs8 \
-	_acornadfs32 \
 	_apple2 \
 	_atari \
 	_micropolis \
 	_northstar \
 	_mx \
 	40track_drive \
-	acornadfs160 \
-	acornadfs320 \
-	acornadfs640 \
-	acornadfs800 \
-	acornadfs1600 \
+	acornadfs \
 	acorndfs \
 	aeslanier \
 	agat840 \