Consolidate some Hewlett-Packard LIF disks together.

Makefile

@@ -193,7 +193,9 @@ $(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--35)
 $(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--40)
 $(call do-encodedecodetest,commodore1581)
 $(call do-encodedecodetest,cmd_fd2000)
-$(call do-encodedecodetest,hp9121)
+$(call do-encodedecodetest,hplif,,--264)
+$(call do-encodedecodetest,hplif,,--616)
+$(call do-encodedecodetest,hplif,,--770)
 $(call do-encodedecodetest,ibm1200)
 $(call do-encodedecodetest,ibm1232)
 $(call do-encodedecodetest,ibm1440)

src/formats/build.mk

@@ -24,9 +24,7 @@ FORMATS = \
 	epsonpf10 \
 	f85 \
 	fb100 \
-	hp9121 \
+	hplif \
-	hplif616 \
-	hplif770 \
 	ibm \
 	ibm1200 \
 	ibm1232 \

src/formats/hp9121.textpb

@@ -1,49 +0,0 @@
-comment: 'Hewlett-Packard 9121 264kB 3.5" SSDD'
-
-image_reader {
-	filename: "hp9121.img"
-	type: IMG
-}
-
-layout {
-	tracks: 66
-	sides: 1
-	layoutdata {
-		sector_size: 256
-		physical {
-			sector: 0
-			sector: 4
-			sector: 8
-			sector: 12
-			sector: 1
-			sector: 5
-			sector: 9
-			sector: 13
-			sector: 2
-			sector: 6
-			sector: 10
-			sector: 14
-			sector: 3
-			sector: 7
-			sector: 11
-			sector: 15
-		}
-	}
-}
-
-encoder {
-	ibm {
-		trackdata {
-			emit_iam: false
-			target_rotational_period_ms: 200
-			target_clock_period_us: 4
-			gap0: 80
-			gap2: 22
-			gap3: 44
-		}
-	}
-}
-
-decoder {
-	ibm {}
-}

src/formats/hplif.textpb

@@ -0,0 +1,143 @@
+comment: 'Hewlett-Packard LIF family'
+
+drive {
+	high_density: false
+}
+
+image_reader {
+	filename: "hplif.img"
+	type: IMG
+}
+
+image_writer {
+	filename: "hplif.img"
+	type: IMG
+}
+
+decoder {
+	ibm {
+	}
+}
+
+filesystem {
+	type: LIF
+}
+
+tpi: 96
+
+option_group {
+	comment: "Format family"
+
+	option {
+		name: "264"
+		comment: '264kB 3.5" 66-track SSDD; HP9121 format'
+
+		config {
+			layout {
+				tracks: 66
+				sides: 1
+				layoutdata {
+					sector_size: 256
+					physical {
+						sector: 0
+						sector: 4
+						sector: 8
+						sector: 12
+						sector: 1
+						sector: 5
+						sector: 9
+						sector: 13
+						sector: 2
+						sector: 6
+						sector: 10
+						sector: 14
+						sector: 3
+						sector: 7
+						sector: 11
+						sector: 15
+					}
+				}
+			}
+
+			encoder {
+				ibm {
+					trackdata {
+						emit_iam: false
+						target_rotational_period_ms: 200
+						target_clock_period_us: 4
+						gap0: 80
+						gap2: 22
+						gap3: 44
+					}
+				}
+			}
+		}
+	}
+
+	option {
+		name: "616"
+		comment: '616kB 3.5" 77-track DSDD'
+
+		config {
+			layout {
+				tracks: 77
+				sides: 2
+				layoutdata {
+					sector_size: 256
+					physical {
+						start_sector: 1
+						count: 16
+					}
+				}
+			}
+
+			encoder {
+				ibm {
+					trackdata {
+						target_rotational_period_ms: 200
+						target_clock_period_us: 4
+						emit_iam: false
+						gap0: 80
+						gap2: 22
+						gap3: 40
+					}
+				}
+			}
+		}
+	}
+
+	option {
+		name: "770"
+		comment: '770kB 3.5" 77-track DSDD'
+
+		config {
+			layout {
+				tracks: 77
+				sides: 2
+				layoutdata {
+					sector_size: 1024
+					physical {
+						sector: 1
+						sector: 2
+						sector: 3
+						sector: 4
+						sector: 5
+					}
+				}
+			}
+
+			encoder {
+				ibm {
+					trackdata {
+						target_rotational_period_ms: 200
+						target_clock_period_us: 4
+						gap0: 80
+						gap2: 22
+						gap3: 80
+					}
+				}
+			}
+		}
+	}
+}
+

src/formats/hplif616.textpb

@@ -1,51 +0,0 @@
-comment: 'Hewlett-Packard LIF 616kB 3.5" DSDD'
-
-drive {
-	high_density: false
-	rotational_period_ms: 200
-}
-
-image_reader {
-	filename: "hplif616.img"
-	type: IMG
-}
-
-image_writer {
-	filename: "hplif616.img"
-	type: IMG
-}
-
-layout {
-	tracks: 77
-	sides: 2
-	layoutdata {
-		sector_size: 256
-		physical {
-			start_sector: 1
-			count: 16
-		}
-	}
-}
-
-encoder {
-	ibm {
-		trackdata {
-			target_rotational_period_ms: 200
-			target_clock_period_us: 4
-			emit_iam: false
-			gap0: 80
-			gap2: 22
-			gap3: 40
-		}
-	}
-}
-
-decoder {
-	ibm {
-	}
-}
-
-filesystem {
-	type: LIF
-}
-

src/formats/hplif770.textpb

@@ -1,54 +0,0 @@
-comment: 'Hewlett-Packard LIF 770kB 3.5" DSDD'
-
-drive {
-	high_density: false
-	rotational_period_ms: 200
-}
-
-image_reader {
-	filename: "hplif770.img"
-	type: IMG
-}
-
-image_writer {
-	filename: "hplif770.img"
-	type: IMG
-}
-
-layout {
-	tracks: 77
-	sides: 2
-	layoutdata {
-		sector_size: 1024
-		physical {
-			sector: 1
-			sector: 2
-			sector: 3
-			sector: 4
-			sector: 5
-		}
-	}
-}
-
-encoder {
-	ibm {
-		trackdata {
-			target_rotational_period_ms: 200
-			target_clock_period_us: 4
-			gap0: 80
-			gap2: 22
-			gap3: 80
-		}
-	}
-}
-
-decoder {
-	ibm {
-	}
-}
-
-filesystem {
-	type: LIF
-}
-
-