Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

floppy: What wd177x_dsk has become should be taken out and shot

Browse Source
This commit is contained in:
Olivier Galibert 2021-03-31 17:23:31 +02:00
parent 69bde90a2f
commit 593ce66eb2
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/formats/acorn_dsk.cpp
View File

@ -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;

12
src/lib/formats/acorn_dsk.h
View File

@ -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;

2
src/lib/formats/afs_dsk.cpp
View File

@ -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;

4
src/lib/formats/flex_dsk.cpp
View File

@ -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];

2
src/lib/formats/flex_dsk.h
View File

@ -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:

6
src/lib/formats/ibmxdf_dsk.cpp
View File

@ -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;

2
src/lib/formats/ibmxdf_dsk.h
View File

@ -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;

4
src/lib/formats/mdos_dsk.cpp
View File

@ -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);

2
src/lib/formats/mdos_dsk.h
View File

@ -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:

2
src/lib/formats/opd_dsk.cpp
View File

@ -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;

4
src/lib/formats/os9_dsk.cpp
View File

@ -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);

2
src/lib/formats/os9_dsk.h
View File

@ -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:

2
src/lib/formats/trd_dsk.cpp
View File

@ -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);

2
src/lib/formats/trd_dsk.h
View File

@ -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;

4
src/lib/formats/uniflex_dsk.cpp
View File

@ -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];

2
src/lib/formats/uniflex_dsk.h
View File

@ -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: