diff options
author | 2020-06-22 12:43:34 +0300 | |
---|---|---|
committer | 2020-06-22 12:43:34 +0300 | |
commit | fc7f76dc12d3fc14768fcd1482ed1a21214ca7db (patch) | |
tree | 751f05a9c0fa781c77dd5e5c13dd7b55ee13233b | |
parent | c553dbee4f80081d7ff4ad550ec782b738a0037e (diff) |
this format was redundant (nw)
-rw-r--r-- | scripts/src/formats.lua | 12 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 1 | ||||
-rw-r--r-- | src/devices/bus/spectrum/d40.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/spectrum/d40.h | 4 | ||||
-rw-r--r-- | src/lib/formats/d40_dsk.cpp | 46 | ||||
-rw-r--r-- | src/lib/formats/d40_dsk.h | 31 |
6 files changed, 2 insertions, 98 deletions
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 9fa678257cb..f168dbe81ca 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -619,18 +619,6 @@ end -------------------------------------------------- -- ---@src/lib/formats/d40_dsk.h,FORMATS["D40_DSK"] = true --------------------------------------------------- - -if (FORMATS["D40_DSK"]~=null or _OPTIONS["with-tools"]) then - files { - MAME_DIR.. "src/lib/formats/d40_dsk.cpp", - MAME_DIR.. "src/lib/formats/d40_dsk.h", - } -end - --------------------------------------------------- --- --@src/lib/formats/d80_dsk.h,FORMATS["D80_DSK"] = true -------------------------------------------------- diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 7d543e560a7..541899da7c0 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -983,7 +983,6 @@ FORMATS["CONCEPT_DSK"] = true FORMATS["COUPEDSK"] = true FORMATS["CPIS_DSK"] = true FORMATS["CSW_CAS"] = true -FORMATS["D40_DSK"] = true FORMATS["D64_DSK"] = true FORMATS["D71_DSK"] = true FORMATS["D80_DSK"] = true diff --git a/src/devices/bus/spectrum/d40.cpp b/src/devices/bus/spectrum/d40.cpp index d25b7eaad83..de29396815b 100644 --- a/src/devices/bus/spectrum/d40.cpp +++ b/src/devices/bus/spectrum/d40.cpp @@ -57,11 +57,7 @@ static void didaktik_floppies(device_slot_interface &device) // floppy_format_type floppy_formats //------------------------------------------------- -FLOPPY_FORMATS_MEMBER(spectrum_d40_device::floppy_formats) - FLOPPY_D40D80_FORMAT -FLOPPY_FORMATS_END - -FLOPPY_FORMATS_MEMBER(spectrum_d80v2_device::floppy_formats) +FLOPPY_FORMATS_MEMBER(spectrum_d40base_device::floppy_formats) FLOPPY_PC_FORMAT FLOPPY_FORMATS_END diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h index 2cef4143814..94be7b77084 100644 --- a/src/devices/bus/spectrum/d40.h +++ b/src/devices/bus/spectrum/d40.h @@ -17,7 +17,6 @@ #include "machine/wd_fdc.h" #include "machine/upd765.h" #include "machine/i8255.h" -#include "formats/d40_dsk.h" #include "formats/pc_dsk.h" //************************************************************************** @@ -28,6 +27,7 @@ class spectrum_d40base_device: public device_t, public device_spectrum_expansion { public: DECLARE_INPUT_CHANGED_MEMBER(snapshot_button); + DECLARE_FLOPPY_FORMATS(floppy_formats); protected: spectrum_d40base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -69,7 +69,6 @@ class spectrum_d40_device : public: spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_FLOPPY_FORMATS(floppy_formats); protected: spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual void device_add_mconfig(machine_config &config) override; @@ -109,7 +108,6 @@ class spectrum_d80v2_device : public: spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_FLOPPY_FORMATS(floppy_formats); protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/lib/formats/d40_dsk.cpp b/src/lib/formats/d40_dsk.cpp deleted file mode 100644 index 868c36a7eef..00000000000 --- a/src/lib/formats/d40_dsk.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:MetalliC -/********************************************************************* - - formats/d40_dsk.c - - Didaktik D40/D80 disk images - -*********************************************************************/ - -#include <cassert> - -#include "formats/d40_dsk.h" - -d40_format::d40_format() : wd177x_format(formats) -{ -} - -const char *d40_format::name() const -{ - return "d40"; -} - -const char *d40_format::description() const -{ - return "Didaktik D40/D80 floppy disk image"; -} - -const char *d40_format::extensions() const -{ - return "d40,d80"; -} - -const d40_format::format d40_format::formats[] = { - { // 400K 5"25 double density, gaps unverified - floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, - 2000, 10, 40, 2, 512, {}, 1, {}, 50, 22, 36 - }, - { // 720K 3'5 double density, gaps unverified - floppy_image::FF_35, floppy_image::DSDD, floppy_image::MFM, - 2000, 9, 80, 2, 512, {}, 1, {}, 50, 22, 80 - }, - {} -}; - -const floppy_format_type FLOPPY_D40D80_FORMAT = &floppy_image_format_creator<d40_format>; diff --git a/src/lib/formats/d40_dsk.h b/src/lib/formats/d40_dsk.h deleted file mode 100644 index 93aa08e46af..00000000000 --- a/src/lib/formats/d40_dsk.h +++ /dev/null @@ -1,31 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:MetalliC -/********************************************************************* - - formats/d40_dsk.h - - Didaktik D40/D80 disk images - -*********************************************************************/ -#ifndef MAME_FORMATS_D40_DSK_H -#define MAME_FORMATS_D40_DSK_H - -#pragma once - -#include "wd177x_dsk.h" - -class d40_format : public wd177x_format { -public: - d40_format(); - - virtual const char *name() const override; - virtual const char *description() const override; - virtual const char *extensions() const override; - -private: - static const format formats[]; -}; - -extern const floppy_format_type FLOPPY_D40D80_FORMAT; - -#endif // MAME_FORMATS_D40_DSK_H |