From 593ce66eb2126027a3b1791a2d549df4d8051d1d Mon Sep 17 00:00:00 2001
From: Olivier Galibert <galibert@pobox.com>
Date: Wed, 31 Mar 2021 17:23:31 +0200
Subject: [PATCH] floppy: What wd177x_dsk has become should be taken out and
 shot

---
 src/lib/formats/acorn_dsk.cpp   | 24 ++++++++++++------------
 src/lib/formats/acorn_dsk.h     | 12 ++++++------
 src/lib/formats/afs_dsk.cpp     |  2 +-
 src/lib/formats/flex_dsk.cpp    |  4 ++--
 src/lib/formats/flex_dsk.h      |  2 +-
 src/lib/formats/ibmxdf_dsk.cpp  |  6 +++---
 src/lib/formats/ibmxdf_dsk.h    |  2 +-
 src/lib/formats/mdos_dsk.cpp    |  4 ++--
 src/lib/formats/mdos_dsk.h      |  2 +-
 src/lib/formats/opd_dsk.cpp     |  2 +-
 src/lib/formats/os9_dsk.cpp     |  4 ++--
 src/lib/formats/os9_dsk.h       |  2 +-
 src/lib/formats/trd_dsk.cpp     |  2 +-
 src/lib/formats/trd_dsk.h       |  2 +-
 src/lib/formats/uniflex_dsk.cpp |  4 ++--
 src/lib/formats/uniflex_dsk.h   |  2 +-
 16 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp
index 2f9f5ebf7ab..c4668478b05 100644
--- a/src/lib/formats/acorn_dsk.cpp
+++ b/src/lib/formats/acorn_dsk.cpp
@@ -29,7 +29,7 @@ const char *acorn_ssd_format::extensions() const
 	return "ssd,bbc,img";
 }
 
-int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t cat[8];
 	uint32_t sectors0, sectors2;
@@ -95,7 +95,7 @@ int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor)
 
 int acorn_ssd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if(type != -1)
 		return 90;
@@ -171,7 +171,7 @@ const char *acorn_dsd_format::extensions() const
 	return "dsd";
 }
 
-int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t cat[8];
 	uint32_t sectors0, sectors2;
@@ -218,7 +218,7 @@ int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor)
 
 int acorn_dsd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 90;
@@ -274,7 +274,7 @@ const char *opus_ddos_format::extensions() const
 	return "dds";
 }
 
-int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor)
+int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t cat[8];
 	uint32_t sectors0, sectors2;
@@ -313,7 +313,7 @@ int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor)
 
 int opus_ddos_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 90;
@@ -369,7 +369,7 @@ const char *acorn_adfs_old_format::extensions() const
 	return "adf,ads,adm,adl";
 }
 
-int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t map[3];
 	uint32_t sectors;
@@ -401,7 +401,7 @@ int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor)
 
 int acorn_adfs_old_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if(type != -1)
 		return 100;
@@ -465,7 +465,7 @@ const char *acorn_adfs_new_format::extensions() const
 	return "adf";
 }
 
-int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t dform[4];
 	uint8_t eform[4];
@@ -498,7 +498,7 @@ int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor)
 
 int acorn_adfs_new_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 100;
@@ -546,7 +546,7 @@ const char *acorn_dos_format::extensions() const
 	return "img";
 }
 
-int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint8_t type;
 
@@ -569,7 +569,7 @@ int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor)
 
 int acorn_dos_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if(type != -1)
 		return 90;
diff --git a/src/lib/formats/acorn_dsk.h b/src/lib/formats/acorn_dsk.h
index 2f3da32184a..1428212cfaa 100644
--- a/src/lib/formats/acorn_dsk.h
+++ b/src/lib/formats/acorn_dsk.h
@@ -20,7 +20,7 @@ class acorn_ssd_format : public wd177x_format
 public:
 	acorn_ssd_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
@@ -36,7 +36,7 @@ class acorn_dsd_format : public wd177x_format
 public:
 	acorn_dsd_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
@@ -52,7 +52,7 @@ class opus_ddos_format : public wd177x_format
 public:
 	opus_ddos_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
@@ -68,7 +68,7 @@ class acorn_adfs_old_format : public wd177x_format
 public:
 	acorn_adfs_old_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
@@ -84,7 +84,7 @@ class acorn_adfs_new_format : public wd177x_format
 public:
 	acorn_adfs_new_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
@@ -100,7 +100,7 @@ class acorn_dos_format : public wd177x_format
 public:
 	acorn_dos_format();
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const char *name() const override;
diff --git a/src/lib/formats/afs_dsk.cpp b/src/lib/formats/afs_dsk.cpp
index b9b6cefadec..d6b275240de 100644
--- a/src/lib/formats/afs_dsk.cpp
+++ b/src/lib/formats/afs_dsk.cpp
@@ -32,7 +32,7 @@ const char *afs_format::extensions() const
 
 int afs_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 50;
diff --git a/src/lib/formats/flex_dsk.cpp b/src/lib/formats/flex_dsk.cpp
index 13dcbb0f367..692cc4bdc9d 100644
--- a/src/lib/formats/flex_dsk.cpp
+++ b/src/lib/formats/flex_dsk.cpp
@@ -73,14 +73,14 @@ const char *flex_format::extensions() const
 
 int flex_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 75;
 	return 0;
 }
 
-int flex_format::find_size(io_generic *io, uint32_t form_factor)
+int flex_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint64_t size = io_generic_size(io);
 	uint8_t boot0[256], boot1[256];
diff --git a/src/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h
index d1b55168c9c..094c6854b24 100644
--- a/src/lib/formats/flex_dsk.h
+++ b/src/lib/formats/flex_dsk.h
@@ -22,7 +22,7 @@ public:
 	virtual const char *description() const override;
 	virtual const char *extensions() const override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual const wd177x_format::format &get_track_format(const format &f, int head, int track) override;
 
 private:
diff --git a/src/lib/formats/ibmxdf_dsk.cpp b/src/lib/formats/ibmxdf_dsk.cpp
index 3682541fd1f..b18ffad63dc 100644
--- a/src/lib/formats/ibmxdf_dsk.cpp
+++ b/src/lib/formats/ibmxdf_dsk.cpp
@@ -54,14 +54,14 @@ const char *ibmxdf_format::extensions() const
 
 int ibmxdf_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 75;
 	return 0;
 }
 
-int ibmxdf_format::find_size(io_generic *io, uint32_t form_factor)
+int ibmxdf_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint64_t size = io_generic_size(io);
 
@@ -175,7 +175,7 @@ const ibmxdf_format::format ibmxdf_format::formats_head1_track0[] = {
 
 bool ibmxdf_format::load(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 	if(type == -1)
 		return false;
 
diff --git a/src/lib/formats/ibmxdf_dsk.h b/src/lib/formats/ibmxdf_dsk.h
index e22cab89c45..6d37142ac30 100644
--- a/src/lib/formats/ibmxdf_dsk.h
+++ b/src/lib/formats/ibmxdf_dsk.h
@@ -27,7 +27,7 @@ public:
 	virtual bool load(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image *image) override;
 	virtual bool supports_save() const override { return false; }
 
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual int get_image_offset(const format &f, int head, int track) override;
 	virtual const wd177x_format::format &get_track_format(const format &f, int head, int track) override;
 
diff --git a/src/lib/formats/mdos_dsk.cpp b/src/lib/formats/mdos_dsk.cpp
index 68a3b403b9d..b96be2f327e 100644
--- a/src/lib/formats/mdos_dsk.cpp
+++ b/src/lib/formats/mdos_dsk.cpp
@@ -74,7 +74,7 @@ const char *mdos_format::extensions() const
 
 int mdos_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+  int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 75;
@@ -109,7 +109,7 @@ int mdos_format::parse_date_field(uint8_t *str)
 	return (high - 0x30) * 10 + (low - 0x30);
 }
 
-int mdos_format::find_size(io_generic *io, uint32_t form_factor)
+int mdos_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint64_t size = io_generic_size(io);
 
diff --git a/src/lib/formats/mdos_dsk.h b/src/lib/formats/mdos_dsk.h
index b6e4420f758..65e7bca9f14 100644
--- a/src/lib/formats/mdos_dsk.h
+++ b/src/lib/formats/mdos_dsk.h
@@ -20,7 +20,7 @@ public:
 	virtual const char *description() const override;
 	virtual const char *extensions() const override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual const wd177x_format::format &get_track_format(const format &f, int head, int track) override;
 
 private:
diff --git a/src/lib/formats/opd_dsk.cpp b/src/lib/formats/opd_dsk.cpp
index 65c139bc6bb..e105d53d678 100644
--- a/src/lib/formats/opd_dsk.cpp
+++ b/src/lib/formats/opd_dsk.cpp
@@ -32,7 +32,7 @@ const char *opd_format::extensions() const
 
 int opd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 90;
diff --git a/src/lib/formats/os9_dsk.cpp b/src/lib/formats/os9_dsk.cpp
index 352afa63c25..b28e4f8d293 100644
--- a/src/lib/formats/os9_dsk.cpp
+++ b/src/lib/formats/os9_dsk.cpp
@@ -71,14 +71,14 @@ const char *os9_format::extensions() const
 
 int os9_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 75;
 	return 0;
 }
 
-int os9_format::find_size(io_generic *io, uint32_t form_factor)
+int os9_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint64_t size = io_generic_size(io);
 
diff --git a/src/lib/formats/os9_dsk.h b/src/lib/formats/os9_dsk.h
index eb062e6bdcf..57dfbfc9ab5 100644
--- a/src/lib/formats/os9_dsk.h
+++ b/src/lib/formats/os9_dsk.h
@@ -22,7 +22,7 @@ public:
 	virtual const char *description() const override;
 	virtual const char *extensions() const override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	virtual const wd177x_format::format &get_track_format(const format &f, int head, int track) override;
 
 private:
diff --git a/src/lib/formats/trd_dsk.cpp b/src/lib/formats/trd_dsk.cpp
index fa5ba083a95..26b6ce5b6a5 100644
--- a/src/lib/formats/trd_dsk.cpp
+++ b/src/lib/formats/trd_dsk.cpp
@@ -31,7 +31,7 @@ const char *trd_format::extensions() const
 	return "trd";
 }
 
-int trd_format::find_size(io_generic *io, uint32_t form_factor)
+int trd_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	int index = -1;
 	uint64_t size = io_generic_size(io);
diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
index 8406734085a..6f19f9976a5 100644
--- a/src/lib/formats/trd_dsk.h
+++ b/src/lib/formats/trd_dsk.h
@@ -24,7 +24,7 @@ public:
 
 private:
 	static const format formats[];
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 };
 
 extern const floppy_format_type FLOPPY_TRD_FORMAT;
diff --git a/src/lib/formats/uniflex_dsk.cpp b/src/lib/formats/uniflex_dsk.cpp
index 21f4479e704..fa5d9b50acc 100644
--- a/src/lib/formats/uniflex_dsk.cpp
+++ b/src/lib/formats/uniflex_dsk.cpp
@@ -33,14 +33,14 @@ const char *uniflex_format::extensions() const
 
 int uniflex_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
-	int type = find_size(io, form_factor);
+	int type = find_size(io, form_factor, variants);
 
 	if (type != -1)
 		return 75;
 	return 0;
 }
 
-int uniflex_format::find_size(io_generic *io, uint32_t form_factor)
+int uniflex_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
 {
 	uint64_t size = io_generic_size(io);
 	uint8_t sir[192];
diff --git a/src/lib/formats/uniflex_dsk.h b/src/lib/formats/uniflex_dsk.h
index eeb50e5bbe9..fad6741f533 100644
--- a/src/lib/formats/uniflex_dsk.h
+++ b/src/lib/formats/uniflex_dsk.h
@@ -20,7 +20,7 @@ public:
 	virtual const char *description() const override;
 	virtual const char *extensions() const override;
 	virtual int identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
-	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants) override;
 	void build_sector_description(const format &f, uint8_t *sectdata, desc_s *sectors, int track, int head) const override;
 
 private: