summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/2d_dsk.h6
-rw-r--r--src/lib/formats/a5105_dsk.h6
-rw-r--r--src/lib/formats/ap2_dsk.cpp2
-rw-r--r--src/lib/formats/ap_dsk35.h16
-rw-r--r--src/lib/formats/applix_dsk.h6
-rw-r--r--src/lib/formats/apridisk.h16
-rw-r--r--src/lib/formats/asst128_dsk.h6
-rw-r--r--src/lib/formats/atom_dsk.h6
-rw-r--r--src/lib/formats/bbc_dsk.h46
-rw-r--r--src/lib/formats/bw12_dsk.h6
-rw-r--r--src/lib/formats/bw2_dsk.h6
-rw-r--r--src/lib/formats/camplynx_dsk.h6
-rw-r--r--src/lib/formats/cd90_640_dsk.h6
-rw-r--r--src/lib/formats/coupedsk.h16
-rw-r--r--src/lib/formats/d64_dsk.cpp2
-rw-r--r--src/lib/formats/d64_dsk.h2
-rw-r--r--src/lib/formats/d80_dsk.cpp4
-rw-r--r--src/lib/formats/dcp_dsk.cpp2
-rw-r--r--src/lib/formats/dcp_dsk.h12
-rw-r--r--src/lib/formats/dim_dsk.h16
-rw-r--r--src/lib/formats/dip_dsk.cpp2
-rw-r--r--src/lib/formats/dip_dsk.h12
-rw-r--r--src/lib/formats/dmv_dsk.h6
-rw-r--r--src/lib/formats/esq16_dsk.h16
-rw-r--r--src/lib/formats/esq8_dsk.h16
-rw-r--r--src/lib/formats/excali64_dsk.h6
-rw-r--r--src/lib/formats/fdd_dsk.h12
-rw-r--r--src/lib/formats/flex_dsk.h12
-rw-r--r--src/lib/formats/flopimg.cpp10
-rw-r--r--src/lib/formats/flopimg.h8
-rw-r--r--src/lib/formats/fmtowns_dsk.h6
-rw-r--r--src/lib/formats/fsd_dsk.h12
-rw-r--r--src/lib/formats/guab_dsk.h6
-rw-r--r--src/lib/formats/hector_minidisc.h6
-rw-r--r--src/lib/formats/imd_dsk.cpp2
-rw-r--r--src/lib/formats/ipf_dsk.cpp3
-rw-r--r--src/lib/formats/itt3030_dsk.h6
-rw-r--r--src/lib/formats/kaypro_dsk.h12
-rw-r--r--src/lib/formats/m20_dsk.h16
-rw-r--r--src/lib/formats/m5_dsk.h6
-rw-r--r--src/lib/formats/mfm_hd.h11
-rw-r--r--src/lib/formats/mm_dsk.h12
-rw-r--r--src/lib/formats/nanos_dsk.h6
-rw-r--r--src/lib/formats/nfd_dsk.h12
-rw-r--r--src/lib/formats/pasti_dsk.cpp2
-rw-r--r--src/lib/formats/pasti_dsk.h12
-rw-r--r--src/lib/formats/pc98_dsk.h6
-rw-r--r--src/lib/formats/pc98fdi_dsk.cpp2
-rw-r--r--src/lib/formats/pc98fdi_dsk.h12
-rw-r--r--src/lib/formats/pk8020_dsk.h6
-rw-r--r--src/lib/formats/pyldin_dsk.h6
-rw-r--r--src/lib/formats/rx50_dsk.h16
-rw-r--r--src/lib/formats/sf7000_dsk.h6
-rw-r--r--src/lib/formats/smx_dsk.h6
-rw-r--r--src/lib/formats/st_dsk.h28
-rw-r--r--src/lib/formats/svi_dsk.h16
-rw-r--r--src/lib/formats/tandy2k_dsk.h6
-rw-r--r--src/lib/formats/td0_dsk.cpp4
-rw-r--r--src/lib/formats/ti99_dsk.h1
-rw-r--r--src/lib/formats/tiki100_dsk.h6
-rw-r--r--src/lib/formats/trd_dsk.h6
-rw-r--r--src/lib/formats/trs80_dsk.h8
-rw-r--r--src/lib/formats/upd765_dsk.cpp4
-rw-r--r--src/lib/formats/upd765_dsk.h2
-rw-r--r--src/lib/formats/vector06_dsk.h6
-rw-r--r--src/lib/formats/victor9k_dsk.h16
-rw-r--r--src/lib/formats/wd177x_dsk.cpp2
-rw-r--r--src/lib/formats/xdf_dsk.h6
68 files changed, 295 insertions, 294 deletions
diff --git a/src/lib/formats/2d_dsk.h b/src/lib/formats/2d_dsk.h
index ab70b95f21a..95ee8dbbf20 100644
--- a/src/lib/formats/2d_dsk.h
+++ b/src/lib/formats/2d_dsk.h
@@ -20,9 +20,9 @@ class _2d_format : public wd177x_format
public:
_2d_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/a5105_dsk.h b/src/lib/formats/a5105_dsk.h
index 6f987a81199..cfe7a2f6a0e 100644
--- a/src/lib/formats/a5105_dsk.h
+++ b/src/lib/formats/a5105_dsk.h
@@ -17,9 +17,9 @@ class a5105_format : public upd765_format {
public:
a5105_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp
index 49010ff62e1..774d4785735 100644
--- a/src/lib/formats/ap2_dsk.cpp
+++ b/src/lib/formats/ap2_dsk.cpp
@@ -535,7 +535,7 @@ static const UINT8 prodos_skewing[] =
};
-a2_16sect_format::a2_16sect_format() : floppy_image_format_t()
+a2_16sect_format::a2_16sect_format() : floppy_image_format_t(), m_prodos_order(false)
{
}
diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h
index 432eed42d8e..533307e2708 100644
--- a/src/lib/formats/ap_dsk35.h
+++ b/src/lib/formats/ap_dsk35.h
@@ -28,14 +28,14 @@ class dc42_format : public floppy_image_format_t
public:
dc42_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
private:
static const desc_e mac_gcr[];
diff --git a/src/lib/formats/applix_dsk.h b/src/lib/formats/applix_dsk.h
index 1a833fa55e6..c56213ade74 100644
--- a/src/lib/formats/applix_dsk.h
+++ b/src/lib/formats/applix_dsk.h
@@ -17,9 +17,9 @@ class applix_format : public wd177x_format {
public:
applix_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/apridisk.h b/src/lib/formats/apridisk.h
index 6eb5fc4617e..4faf756fd5a 100644
--- a/src/lib/formats/apridisk.h
+++ b/src/lib/formats/apridisk.h
@@ -20,14 +20,14 @@ class apridisk_format : public floppy_image_format_t
public:
apridisk_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
-
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+ virtual bool supports_save() const override;
private:
static const int APR_HEADER_SIZE = 128;
diff --git a/src/lib/formats/asst128_dsk.h b/src/lib/formats/asst128_dsk.h
index 32b455fa1f7..b19aab50f27 100644
--- a/src/lib/formats/asst128_dsk.h
+++ b/src/lib/formats/asst128_dsk.h
@@ -17,9 +17,9 @@ class asst128_format : public upd765_format {
public:
asst128_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/atom_dsk.h b/src/lib/formats/atom_dsk.h
index 45187205f1c..7f64810e87c 100644
--- a/src/lib/formats/atom_dsk.h
+++ b/src/lib/formats/atom_dsk.h
@@ -9,9 +9,9 @@ class atom_format : public wd177x_format
public:
atom_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/bbc_dsk.h b/src/lib/formats/bbc_dsk.h
index 28bba03e61b..9378a25ec81 100644
--- a/src/lib/formats/bbc_dsk.h
+++ b/src/lib/formats/bbc_dsk.h
@@ -20,12 +20,12 @@ class bbc_dfs_format : public wd177x_format
public:
bbc_dfs_format();
- virtual int find_size(io_generic *io, UINT32 form_factor);
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual int get_image_offset(const format &f, int head, int track);
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual int find_size(io_generic *io, UINT32 form_factor) override;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual int get_image_offset(const format &f, int head, int track) override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
@@ -36,12 +36,12 @@ class bbc_adfs_format : public wd177x_format
public:
bbc_adfs_format();
- virtual int find_size(io_generic *io, UINT32 form_factor);
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual int get_image_offset(const format &f, int head, int track);
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual int find_size(io_generic *io, UINT32 form_factor) override;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual int get_image_offset(const format &f, int head, int track) override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
@@ -52,12 +52,12 @@ class bbc_dos_format : public wd177x_format
public:
bbc_dos_format();
- virtual int find_size(io_generic *io, UINT32 form_factor);
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual int get_image_offset(const format &f, int head, int track);
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual int find_size(io_generic *io, UINT32 form_factor) override;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual int get_image_offset(const format &f, int head, int track) override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
@@ -68,11 +68,11 @@ class bbc_cpm_format : public wd177x_format
public:
bbc_cpm_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual int get_image_offset(const format &f, int head, int track);
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual int get_image_offset(const format &f, int head, int track) override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/bw12_dsk.h b/src/lib/formats/bw12_dsk.h
index c9455463486..ca43914ffb0 100644
--- a/src/lib/formats/bw12_dsk.h
+++ b/src/lib/formats/bw12_dsk.h
@@ -17,9 +17,9 @@ class bw12_format : public upd765_format {
public:
bw12_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h
index d5fa5c66187..edf184ca4ae 100644
--- a/src/lib/formats/bw2_dsk.h
+++ b/src/lib/formats/bw2_dsk.h
@@ -17,9 +17,9 @@ class bw2_format : public upd765_format {
public:
bw2_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/camplynx_dsk.h b/src/lib/formats/camplynx_dsk.h
index 96efac0b60b..ccbc7015d5b 100644
--- a/src/lib/formats/camplynx_dsk.h
+++ b/src/lib/formats/camplynx_dsk.h
@@ -17,9 +17,9 @@ class camplynx_format : public wd177x_format {
public:
camplynx_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/cd90_640_dsk.h b/src/lib/formats/cd90_640_dsk.h
index ccf80508047..489942788be 100644
--- a/src/lib/formats/cd90_640_dsk.h
+++ b/src/lib/formats/cd90_640_dsk.h
@@ -20,9 +20,9 @@ class cd90_640_format : public wd177x_format
public:
cd90_640_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/coupedsk.h b/src/lib/formats/coupedsk.h
index 9345ded421a..19f2d7ddac5 100644
--- a/src/lib/formats/coupedsk.h
+++ b/src/lib/formats/coupedsk.h
@@ -18,14 +18,14 @@ class mgt_format : public floppy_image_format_t
public:
mgt_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
static const floppy_image_format_t::desc_e desc_10[];
};
diff --git a/src/lib/formats/d64_dsk.cpp b/src/lib/formats/d64_dsk.cpp
index 531ce441b99..b637d44c48c 100644
--- a/src/lib/formats/d64_dsk.cpp
+++ b/src/lib/formats/d64_dsk.cpp
@@ -79,7 +79,7 @@ const int d64_format::speed_zone[] =
0, 0 // 41-42
};
-int d64_format::find_size(io_generic *io, UINT32 form_factor)
+int d64_format::find_size(io_generic *io, UINT32 form_factor) const
{
UINT64 size = io_generic_size(io);
for(int i=0; formats[i].sector_count; i++) {
diff --git a/src/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h
index 5eaecc3b042..c5bef4b3313 100644
--- a/src/lib/formats/d64_dsk.h
+++ b/src/lib/formats/d64_dsk.h
@@ -58,7 +58,7 @@ protected:
const format *formats;
- int find_size(io_generic *io, UINT32 form_factor);
+ int find_size(io_generic *io, UINT32 form_factor) const;
virtual int get_physical_track(const format &f, int head, int track);
virtual UINT32 get_cell_size(const format &f, int track);
virtual int get_sectors_per_track(const format &f, int track);
diff --git a/src/lib/formats/d80_dsk.cpp b/src/lib/formats/d80_dsk.cpp
index 222ef488544..12ea14ad80f 100644
--- a/src/lib/formats/d80_dsk.cpp
+++ b/src/lib/formats/d80_dsk.cpp
@@ -12,11 +12,11 @@
#include "formats/d80_dsk.h"
-d80_format::d80_format() : d64_format(file_formats)
+d80_format::d80_format() : d64_format(file_formats), formats(nullptr)
{
}
-d80_format::d80_format(const format *_formats) : d64_format(_formats)
+d80_format::d80_format(const format *_formats) : d64_format(_formats), formats(nullptr)
{
}
diff --git a/src/lib/formats/dcp_dsk.cpp b/src/lib/formats/dcp_dsk.cpp
index fa805979d7b..4e2c305e6f6 100644
--- a/src/lib/formats/dcp_dsk.cpp
+++ b/src/lib/formats/dcp_dsk.cpp
@@ -205,7 +205,7 @@ bool dcp_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666;
int ssize;
- for (ssize = 0; (128 << ssize) < bps; ssize++);
+ for (ssize = 0; (128 << ssize) < bps; ssize++) {};
desc_pc_sector sects[256];
UINT8 sect_data[65536];
diff --git a/src/lib/formats/dcp_dsk.h b/src/lib/formats/dcp_dsk.h
index d6e169809cf..92e447741f5 100644
--- a/src/lib/formats/dcp_dsk.h
+++ b/src/lib/formats/dcp_dsk.h
@@ -19,13 +19,13 @@ class dcp_format : public floppy_image_format_t
public:
dcp_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_DCP_FORMAT;
diff --git a/src/lib/formats/dim_dsk.h b/src/lib/formats/dim_dsk.h
index c7d4cea0d34..54f84aff471 100644
--- a/src/lib/formats/dim_dsk.h
+++ b/src/lib/formats/dim_dsk.h
@@ -24,14 +24,14 @@ class dim_format : public floppy_image_format_t
public:
dim_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_DIM_FORMAT;
diff --git a/src/lib/formats/dip_dsk.cpp b/src/lib/formats/dip_dsk.cpp
index e7c7aa072e9..9e6570f8071 100644
--- a/src/lib/formats/dip_dsk.cpp
+++ b/src/lib/formats/dip_dsk.cpp
@@ -61,7 +61,7 @@ bool dip_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666;
int ssize;
- for (ssize = 0; (128 << ssize) < bps; ssize++);
+ for (ssize = 0; (128 << ssize) < bps; ssize++) {};
desc_pc_sector sects[256];
UINT8 sect_data[65536];
diff --git a/src/lib/formats/dip_dsk.h b/src/lib/formats/dip_dsk.h
index e2ca876dff0..dba5e4afee9 100644
--- a/src/lib/formats/dip_dsk.h
+++ b/src/lib/formats/dip_dsk.h
@@ -19,13 +19,13 @@ class dip_format : public floppy_image_format_t
public:
dip_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_DIP_FORMAT;
diff --git a/src/lib/formats/dmv_dsk.h b/src/lib/formats/dmv_dsk.h
index 31551ffc627..022a6e1e489 100644
--- a/src/lib/formats/dmv_dsk.h
+++ b/src/lib/formats/dmv_dsk.h
@@ -17,9 +17,9 @@ class dmv_format : public upd765_format {
public:
dmv_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/esq16_dsk.h b/src/lib/formats/esq16_dsk.h
index caf02f7995d..696db98345c 100644
--- a/src/lib/formats/esq16_dsk.h
+++ b/src/lib/formats/esq16_dsk.h
@@ -20,14 +20,14 @@ class esqimg_format : public floppy_image_format_t
public:
esqimg_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
static const desc_e esq_10_desc[];
diff --git a/src/lib/formats/esq8_dsk.h b/src/lib/formats/esq8_dsk.h
index 4646fcc225c..5fb998bf3b0 100644
--- a/src/lib/formats/esq8_dsk.h
+++ b/src/lib/formats/esq8_dsk.h
@@ -22,14 +22,14 @@ class esq8img_format : public floppy_image_format_t
public:
esq8img_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
static const desc_e esq_6_desc[];
diff --git a/src/lib/formats/excali64_dsk.h b/src/lib/formats/excali64_dsk.h
index b25698a3ffa..c2800d18875 100644
--- a/src/lib/formats/excali64_dsk.h
+++ b/src/lib/formats/excali64_dsk.h
@@ -17,9 +17,9 @@ class excali64_format : public wd177x_format {
public:
excali64_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/fdd_dsk.h b/src/lib/formats/fdd_dsk.h
index 9e43479565e..6a7faa57669 100644
--- a/src/lib/formats/fdd_dsk.h
+++ b/src/lib/formats/fdd_dsk.h
@@ -19,13 +19,13 @@ class fdd_format : public floppy_image_format_t
public:
fdd_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_FDD_FORMAT;
diff --git a/src/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h
index 95a03a78f15..bade0115c56 100644
--- a/src/lib/formats/flex_dsk.h
+++ b/src/lib/formats/flex_dsk.h
@@ -15,12 +15,12 @@ class flex_format : public floppy_image_format_t {
public:
flex_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool supports_save() const override;
private:
struct sysinfo_sector
diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp
index 57281fcda0e..f8cf7c83780 100644
--- a/src/lib/formats/flopimg.cpp
+++ b/src/lib/formats/flopimg.cpp
@@ -958,7 +958,7 @@ floppy_image::~floppy_image()
{
}
-void floppy_image::get_maximal_geometry(int &_tracks, int &_heads)
+void floppy_image::get_maximal_geometry(int &_tracks, int &_heads) const
{
_tracks = tracks;
_heads = heads;
@@ -1097,7 +1097,7 @@ bool floppy_image_format_t::type_data_mfm(int type, int p1, const gen_crc_info *
(type == CRC && (crcs[p1].type == CRC_CCITT || crcs[p1].type == CRC_AMIGA));
}
-void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs)
+void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs) const
{
memset(crcs, 0, MAX_CRC_COUNT * sizeof(*crcs));
for(int i=0; i != MAX_CRC_COUNT; i++)
@@ -1134,7 +1134,7 @@ void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs)
for(int i=0; desc[i].type != END; i++)
if(desc[i].type == CRC) {
int j;
- for(j = i+1; desc[j].type != END && type_no_data(desc[j].type); j++);
+ for(j = i+1; desc[j].type != END && type_no_data(desc[j].type); j++) {};
crcs[desc[i].p1].fixup_mfm_clock = type_data_mfm(desc[j].type, desc[j].p1, crcs);
}
}
@@ -1545,7 +1545,7 @@ void floppy_image_format_t::generate_track(const desc_e *desc, int track, int he
case SIZE_ID: {
int size = sect[sector_idx].size;
int id;
- for(id = 0; size > 128; size >>=1, id++);
+ for(id = 0; size > 128; size >>=1, id++) {};
mfm_w(buffer, 8, id);
break;
}
@@ -1553,7 +1553,7 @@ void floppy_image_format_t::generate_track(const desc_e *desc, int track, int he
case SIZE_ID_FM: {
int size = sect[sector_idx].size;
int id;
- for(id = 0; size > 128; size >>=1, id++);
+ for(id = 0; size > 128; size >>=1, id++) {};
fm_w(buffer, 8, id);
break;
}
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index c3e42c5c96d..0f8c1a605a9 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -607,7 +607,7 @@ private:
void fixup_crc_victor_header(std::vector<UINT32> &buffer, const gen_crc_info *crc);
void fixup_crc_victor_data(std::vector<UINT32> &buffer, const gen_crc_info *crc);
void fixup_crcs(std::vector<UINT32> &buffer, gen_crc_info *crcs);
- void collect_crcs(const desc_e *desc, gen_crc_info *crcs);
+ void collect_crcs(const desc_e *desc, gen_crc_info *crcs) const;
int sbit_r(const UINT8 *bitstream, int pos);
int sbit_rp(const UINT8 *bitstream, int &pos, int track_size);
@@ -721,9 +721,9 @@ public:
virtual ~floppy_image();
//! @return the form factor.
- UINT32 get_form_factor() { return form_factor; }
+ UINT32 get_form_factor() const { return form_factor; }
//! @return the variant.
- UINT32 get_variant() { return variant; }
+ UINT32 get_variant() const { return variant; }
//! @param v the variant.
void set_variant(UINT32 v) { variant = v; }
@@ -751,7 +751,7 @@ public:
//! @return the current write splice position.
UINT32 get_write_splice_position(int track, int head, int subtrack = 0) const { return track_array[track*4+subtrack][head].write_splice; }
//! @return the maximal geometry supported by this format.
- void get_maximal_geometry(int &tracks, int &heads);
+ void get_maximal_geometry(int &tracks, int &heads) const;
//! @return the current geometry of the loaded image.
void get_actual_geometry(int &tracks, int &heads);
diff --git a/src/lib/formats/fmtowns_dsk.h b/src/lib/formats/fmtowns_dsk.h
index ae11ef78961..4bf20990ec9 100644
--- a/src/lib/formats/fmtowns_dsk.h
+++ b/src/lib/formats/fmtowns_dsk.h
@@ -15,9 +15,9 @@ class fmtowns_format : public wd177x_format {
public:
fmtowns_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/fsd_dsk.h b/src/lib/formats/fsd_dsk.h
index 8d7a9302926..fdfb6fb3d27 100644
--- a/src/lib/formats/fsd_dsk.h
+++ b/src/lib/formats/fsd_dsk.h
@@ -29,13 +29,13 @@ class fsd_format : public floppy_image_format_t
public:
fsd_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
};
extern const floppy_format_type FLOPPY_FSD_FORMAT;
diff --git a/src/lib/formats/guab_dsk.h b/src/lib/formats/guab_dsk.h
index 36280ddd88f..3fe6e2a670e 100644
--- a/src/lib/formats/guab_dsk.h
+++ b/src/lib/formats/guab_dsk.h
@@ -20,9 +20,9 @@ class guab_format : public wd177x_format
public:
guab_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/hector_minidisc.h b/src/lib/formats/hector_minidisc.h
index d850573f2b6..54162508dd8 100644
--- a/src/lib/formats/hector_minidisc.h
+++ b/src/lib/formats/hector_minidisc.h
@@ -20,9 +20,9 @@ class hmd_format : public upd765_format
public:
hmd_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp
index 05320686e40..8f660b91535 100644
--- a/src/lib/formats/imd_dsk.cpp
+++ b/src/lib/formats/imd_dsk.cpp
@@ -427,7 +427,7 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
io_generic_read(io, &img[0], 0, size);
UINT64 pos;
- for(pos=0; pos < size && img[pos] != 0x1a; pos++);
+ for(pos=0; pos < size && img[pos] != 0x1a; pos++) {};
pos++;
if(pos >= size)
diff --git a/src/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp
index ade50a8e2f9..e7b8aad9137 100644
--- a/src/lib/formats/ipf_dsk.cpp
+++ b/src/lib/formats/ipf_dsk.cpp
@@ -5,7 +5,8 @@
const floppy_format_type FLOPPY_IPF_FORMAT = &floppy_image_format_creator<ipf_format>;
-ipf_format::ipf_format()
+ipf_format::ipf_format(): tinfos(nullptr), tcount(0), type(0), release(0), revision(0), encoder_type(0),
+encoder_revision(0), origin(0), min_cylinder(0), max_cylinder(0), min_head(0), max_head(0), credit_day(0), credit_time(0)
{
}
diff --git a/src/lib/formats/itt3030_dsk.h b/src/lib/formats/itt3030_dsk.h
index a43c9c1cd20..49ee5ed95b3 100644
--- a/src/lib/formats/itt3030_dsk.h
+++ b/src/lib/formats/itt3030_dsk.h
@@ -17,9 +17,9 @@ class itt3030_format : public wd177x_format {
public:
itt3030_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/kaypro_dsk.h b/src/lib/formats/kaypro_dsk.h
index 589d16fc150..f65b410bcc8 100644
--- a/src/lib/formats/kaypro_dsk.h
+++ b/src/lib/formats/kaypro_dsk.h
@@ -17,9 +17,9 @@ class kayproii_format : public upd765_format {
public:
kayproii_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
@@ -29,9 +29,9 @@ class kaypro2x_format : public upd765_format {
public:
kaypro2x_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
};
diff --git a/src/lib/formats/m20_dsk.h b/src/lib/formats/m20_dsk.h
index e3f8c9cf411..0ed3deda5ef 100644
--- a/src/lib/formats/m20_dsk.h
+++ b/src/lib/formats/m20_dsk.h
@@ -17,14 +17,14 @@ class m20_format : public floppy_image_format_t {
public:
m20_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_M20_FORMAT;
diff --git a/src/lib/formats/m5_dsk.h b/src/lib/formats/m5_dsk.h
index 15b806b6035..08350c61339 100644
--- a/src/lib/formats/m5_dsk.h
+++ b/src/lib/formats/m5_dsk.h
@@ -17,9 +17,9 @@ class m5_format : public upd765_format {
public:
m5_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h
index 45963e2c3d5..4e583f46db8 100644
--- a/src/lib/formats/mfm_hd.h
+++ b/src/lib/formats/mfm_hd.h
@@ -80,7 +80,7 @@ public:
int headerlen;
int ecctype; // -1 is CRC
- bool sane_rec()
+ bool sane_rec() const
{
return ((interleave > 0 && interleave < 32) && (cylskew >= 0 && cylskew < 32) && (headskew >= 0 && headskew < 32)
&& (write_precomp_cylinder >= -1 && write_precomp_cylinder < 100000)
@@ -93,7 +93,7 @@ public:
write_precomp_cylinder = reduced_wcurr_cylinder = -1;
}
- bool sane_gap()
+ bool sane_gap() const
{
return ((gap1 >= 1 && gap1 < 1000) && (gap2 >= 1 && gap2 < 20) && (gap3 >= 1 && gap3 < 1000)
&& (sync >= 10 && sync < 20)
@@ -105,7 +105,7 @@ public:
gap1 = gap2 = gap3 = sync = headerlen = ecctype = 0;
}
- bool equals_rec(mfmhd_layout_params* other)
+ bool equals_rec(mfmhd_layout_params* other) const
{
return ((interleave == other->interleave) &&
(cylskew == other->cylskew) &&
@@ -114,7 +114,7 @@ public:
(reduced_wcurr_cylinder == other->reduced_wcurr_cylinder));
}
- bool equals_gap(mfmhd_layout_params* other)
+ bool equals_gap(mfmhd_layout_params* other) const
{
return ((gap1 == other->gap1) &&
(gap2 == other->gap2) &&
@@ -146,7 +146,8 @@ enum mfmhd_param_t
class mfmhd_image_format_t
{
public:
- mfmhd_image_format_t() { m_devtag = std::string("mfmhd_image_format_t"); };
+ mfmhd_image_format_t(): m_lastbit(false), m_current_crc(0)
+ { m_devtag = std::string("mfmhd_image_format_t"); };
virtual ~mfmhd_image_format_t() {};
// Load the image.
diff --git a/src/lib/formats/mm_dsk.h b/src/lib/formats/mm_dsk.h
index ad72b23d4e9..84b29ab259f 100644
--- a/src/lib/formats/mm_dsk.h
+++ b/src/lib/formats/mm_dsk.h
@@ -17,9 +17,9 @@ class mm1_format : public upd765_format {
public:
mm1_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
@@ -29,9 +29,9 @@ class mm2_format : public upd765_format {
public:
mm2_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/nanos_dsk.h b/src/lib/formats/nanos_dsk.h
index 97767aa9a59..5a638a0782a 100644
--- a/src/lib/formats/nanos_dsk.h
+++ b/src/lib/formats/nanos_dsk.h
@@ -17,9 +17,9 @@ class nanos_format : public upd765_format {
public:
nanos_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/nfd_dsk.h b/src/lib/formats/nfd_dsk.h
index 5bf460f9084..005196399ba 100644
--- a/src/lib/formats/nfd_dsk.h
+++ b/src/lib/formats/nfd_dsk.h
@@ -19,13 +19,13 @@ class nfd_format : public floppy_image_format_t
public:
nfd_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_NFD_FORMAT;
diff --git a/src/lib/formats/pasti_dsk.cpp b/src/lib/formats/pasti_dsk.cpp
index f6ed1556711..78e016991d9 100644
--- a/src/lib/formats/pasti_dsk.cpp
+++ b/src/lib/formats/pasti_dsk.cpp
@@ -175,7 +175,7 @@ void pasti_format::wd_generate_unsynced_gap(std::vector<UINT32> &track, const wd
for(int i=tstart; i != tend;) {
unsigned char v = obs.track_data[i];
int j;
- for(j=i+1; j != tend && obs.track_data[j] == v; j++);
+ for(j=i+1; j != tend && obs.track_data[j] == v; j++) {};
int size = j-i;
if(size < 4) {
mfm_w(track, 8, v, cell_size);
diff --git a/src/lib/formats/pasti_dsk.h b/src/lib/formats/pasti_dsk.h
index 0d1165f48b4..fe724fb1fb5 100644
--- a/src/lib/formats/pasti_dsk.h
+++ b/src/lib/formats/pasti_dsk.h
@@ -10,13 +10,13 @@ class pasti_format : public floppy_image_format_t
public:
pasti_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
static const desc_e xdesc[];
diff --git a/src/lib/formats/pc98_dsk.h b/src/lib/formats/pc98_dsk.h
index 5655d187399..d948b19ddcc 100644
--- a/src/lib/formats/pc98_dsk.h
+++ b/src/lib/formats/pc98_dsk.h
@@ -22,9 +22,9 @@ class pc98_format : public upd765_format
public:
pc98_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/pc98fdi_dsk.cpp b/src/lib/formats/pc98fdi_dsk.cpp
index 83433606400..1e6f1809536 100644
--- a/src/lib/formats/pc98fdi_dsk.cpp
+++ b/src/lib/formats/pc98fdi_dsk.cpp
@@ -63,7 +63,7 @@ bool pc98fdi_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag
int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666;
int ssize;
- for(ssize=0; (128 << ssize) < sector_size; ssize++);
+ for(ssize=0; (128 << ssize) < sector_size; ssize++) {};
desc_pc_sector sects[256];
UINT8 sect_data[65536];
diff --git a/src/lib/formats/pc98fdi_dsk.h b/src/lib/formats/pc98fdi_dsk.h
index c71c4c587fd..05fd1ccc361 100644
--- a/src/lib/formats/pc98fdi_dsk.h
+++ b/src/lib/formats/pc98fdi_dsk.h
@@ -19,13 +19,13 @@ class pc98fdi_format : public floppy_image_format_t
public:
pc98fdi_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_PC98FDI_FORMAT;
diff --git a/src/lib/formats/pk8020_dsk.h b/src/lib/formats/pk8020_dsk.h
index 1700530c781..7a9da57651a 100644
--- a/src/lib/formats/pk8020_dsk.h
+++ b/src/lib/formats/pk8020_dsk.h
@@ -20,9 +20,9 @@ class pk8020_format : public wd177x_format
public:
pk8020_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/pyldin_dsk.h b/src/lib/formats/pyldin_dsk.h
index 485a5c1e3fe..9ff5482e974 100644
--- a/src/lib/formats/pyldin_dsk.h
+++ b/src/lib/formats/pyldin_dsk.h
@@ -17,9 +17,9 @@ class pyldin_format : public upd765_format {
public:
pyldin_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/rx50_dsk.h b/src/lib/formats/rx50_dsk.h
index 2fd09429c9a..37decb2fa09 100644
--- a/src/lib/formats/rx50_dsk.h
+++ b/src/lib/formats/rx50_dsk.h
@@ -22,14 +22,14 @@ class rx50img_format : public floppy_image_format_t
public:
rx50img_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
static const desc_e rx50_10_desc[];
diff --git a/src/lib/formats/sf7000_dsk.h b/src/lib/formats/sf7000_dsk.h
index df84e36fe22..75f7ff7e314 100644
--- a/src/lib/formats/sf7000_dsk.h
+++ b/src/lib/formats/sf7000_dsk.h
@@ -17,9 +17,9 @@ class sf7000_format : public upd765_format {
public:
sf7000_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h
index 0b8aba5ac07..36a3bd251b5 100644
--- a/src/lib/formats/smx_dsk.h
+++ b/src/lib/formats/smx_dsk.h
@@ -17,9 +17,9 @@ class smx_format : public wd177x_format {
public:
smx_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/st_dsk.h b/src/lib/formats/st_dsk.h
index 0888c980c72..242d7e9cf5b 100644
--- a/src/lib/formats/st_dsk.h
+++ b/src/lib/formats/st_dsk.h
@@ -18,14 +18,14 @@ class st_format : public floppy_image_format_t
public:
st_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
private:
void find_size(io_generic *io, UINT8 &track_count, UINT8 &head_count, UINT8 &sector_count);
@@ -36,14 +36,14 @@ class msa_format : public floppy_image_format_t
public:
msa_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
private:
bool uncompress(UINT8 *buffer, int csize, int usize);
diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
index 6ffd74619a1..9ae933572df 100644
--- a/src/lib/formats/svi_dsk.h
+++ b/src/lib/formats/svi_dsk.h
@@ -20,14 +20,14 @@ class svi_format : public floppy_image_format_t
public:
svi_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
-
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
- virtual bool supports_save() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+ virtual bool supports_save() const override;
};
extern const floppy_format_type FLOPPY_SVI_FORMAT;
diff --git a/src/lib/formats/tandy2k_dsk.h b/src/lib/formats/tandy2k_dsk.h
index c306018fa48..e69eead2e55 100644
--- a/src/lib/formats/tandy2k_dsk.h
+++ b/src/lib/formats/tandy2k_dsk.h
@@ -17,9 +17,9 @@ class tandy2k_format : public upd765_format {
public:
tandy2k_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp
index 600a6868a4e..69b3e5bfc14 100644
--- a/src/lib/formats/td0_dsk.cpp
+++ b/src/lib/formats/td0_dsk.cpp
@@ -510,7 +510,7 @@ void td0dsk_t::reconst()
for (i = 0, j = N_CHAR; j < T; i += 2, j++) {
k = i + 1;
f = freq[j] = freq[i] + freq[k];
- for (k = j - 1; f < freq[k]; k--);
+ for (k = j - 1; f < freq[k]; k--) {};
k++;
l = (j - k) * 2;
@@ -550,7 +550,7 @@ void td0dsk_t::update(int c)
/* swap nodes to keep the tree freq-ordered */
if (k > freq[l = c + 1]) {
- while (k > freq[++l]);
+ while (k > freq[++l]) {};
l--;
freq[c] = freq[l];
freq[l] = k;
diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
index 94ae7cf1f36..64285c1dcce 100644
--- a/src/lib/formats/ti99_dsk.h
+++ b/src/lib/formats/ti99_dsk.h
@@ -35,7 +35,6 @@ protected:
virtual void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) =0;
int get_encoding(int cell_size);
- int get_track_size(int cell_size);
void generate_track_fm(int track, int head, int cell_size, UINT8* trackdata, floppy_image *image);
void generate_track_mfm(int track, int head, int cell_size, UINT8* trackdata, floppy_image *image);
diff --git a/src/lib/formats/tiki100_dsk.h b/src/lib/formats/tiki100_dsk.h
index e3899f97ef9..4037ec5fe77 100644
--- a/src/lib/formats/tiki100_dsk.h
+++ b/src/lib/formats/tiki100_dsk.h
@@ -17,9 +17,9 @@ class tiki100_format : public wd177x_format {
public:
tiki100_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
index 1d830c6d6c5..de4b7ff63d5 100644
--- a/src/lib/formats/trd_dsk.h
+++ b/src/lib/formats/trd_dsk.h
@@ -17,9 +17,9 @@ class trd_format : public wd177x_format {
public:
trd_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/trs80_dsk.h b/src/lib/formats/trs80_dsk.h
index 988d7ee2a7d..73583ca0f48 100644
--- a/src/lib/formats/trs80_dsk.h
+++ b/src/lib/formats/trs80_dsk.h
@@ -20,12 +20,12 @@ class trs80_format : public wd177x_format
public:
trs80_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
protected:
- virtual int get_track_dam_fm(const format &f, int head, int track);
+ virtual int get_track_dam_fm(const format &f, int head, int track) override;
private:
static const format formats[];
diff --git a/src/lib/formats/upd765_dsk.cpp b/src/lib/formats/upd765_dsk.cpp
index eef28c23a4b..d9da1c5bd21 100644
--- a/src/lib/formats/upd765_dsk.cpp
+++ b/src/lib/formats/upd765_dsk.cpp
@@ -16,7 +16,7 @@ upd765_format::upd765_format(const format *_formats)
formats = _formats;
}
-int upd765_format::find_size(io_generic *io, UINT32 form_factor)
+int upd765_format::find_size(io_generic *io, UINT32 form_factor) const
{
UINT64 size = io_generic_size(io);
for(int i=0; formats[i].form_factor; i++) {
@@ -232,7 +232,7 @@ bool upd765_format::save(io_generic *io, floppy_image *image)
{
// Count the number of formats
int formats_count;
- for(formats_count=0; formats[formats_count].form_factor; formats_count++);
+ for(formats_count=0; formats[formats_count].form_factor; formats_count++) {};
// Allocate the storage for the list of testable formats for a
// given cell size
diff --git a/src/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h
index 12bda75d51b..a108931d89b 100644
--- a/src/lib/formats/upd765_dsk.h
+++ b/src/lib/formats/upd765_dsk.h
@@ -46,7 +46,7 @@ public:
protected:
floppy_image_format_t::desc_e* get_desc_fm(const format &f, int &current_size, int &end_gap_index);
floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int &current_size, int &end_gap_index);
- int find_size(io_generic *io, UINT32 form_factor);
+ int find_size(io_generic *io, UINT32 form_factor) const;
int compute_track_size(const format &f) const;
virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const;
void check_compatibility(floppy_image *image, std::vector<int> &candidates);
diff --git a/src/lib/formats/vector06_dsk.h b/src/lib/formats/vector06_dsk.h
index cad2fa3ddf3..f884d79cf78 100644
--- a/src/lib/formats/vector06_dsk.h
+++ b/src/lib/formats/vector06_dsk.h
@@ -20,9 +20,9 @@ class vector06_format : public wd177x_format
public:
vector06_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];
diff --git a/src/lib/formats/victor9k_dsk.h b/src/lib/formats/victor9k_dsk.h
index 1564f1474f7..5664e66155b 100644
--- a/src/lib/formats/victor9k_dsk.h
+++ b/src/lib/formats/victor9k_dsk.h
@@ -27,14 +27,14 @@ public:
victor9k_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
-
- virtual int identify(io_generic *io, UINT32 form_factor);
- virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- virtual bool save(io_generic *io, floppy_image *image);
- virtual bool supports_save() const { return true; }
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+
+ virtual int identify(io_generic *io, UINT32 form_factor) override;
+ virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
+ virtual bool supports_save() const override { return true; }
static int get_rpm(int head, int track);
diff --git a/src/lib/formats/wd177x_dsk.cpp b/src/lib/formats/wd177x_dsk.cpp
index 69458af0335..527fb69a234 100644
--- a/src/lib/formats/wd177x_dsk.cpp
+++ b/src/lib/formats/wd177x_dsk.cpp
@@ -227,7 +227,7 @@ bool wd177x_format::save(io_generic *io, floppy_image *image)
{
// Count the number of formats
int formats_count;
- for(formats_count=0; formats[formats_count].form_factor; formats_count++);
+ for(formats_count=0; formats[formats_count].form_factor; formats_count++) {};
// Allocate the storage for the list of testable formats for a
// given cell size
diff --git a/src/lib/formats/xdf_dsk.h b/src/lib/formats/xdf_dsk.h
index 628d998be87..8ef01c846e4 100644
--- a/src/lib/formats/xdf_dsk.h
+++ b/src/lib/formats/xdf_dsk.h
@@ -17,9 +17,9 @@ class xdf_format : public upd765_format {
public:
xdf_format();
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
static const format formats[];