summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author etabeta78 <etabeta78@users.noreply.github.com>2014-11-23 09:12:23 +0100
committer etabeta78 <etabeta78@users.noreply.github.com>2014-11-23 09:12:23 +0100
commit2a3ed409a93fc914e606301b2e2a71d976b5354e (patch)
tree7dc5fe18478ca2c6206d9361a5bb7dbe3e31a253 /src
parentd5027ab77aaa0716257ff8809eba10f3c86994d8 (diff)
(MESS) included modern .dsk format among default supported
formats. [Riley110]
Diffstat (limited to 'src')
-rw-r--r--src/emu/bus/isa/mc1502_fdc.c4
-rw-r--r--src/emu/bus/isa/p1_fdc.c4
-rw-r--r--src/emu/imagedev/floppy.c1
-rw-r--r--src/emu/imagedev/floppy.h2
-rw-r--r--src/mess/drivers/amstrad.c13
-rw-r--r--src/mess/drivers/einstein.c13
-rw-r--r--src/mess/drivers/mbee.c4
-rw-r--r--src/mess/drivers/pcw.c10
-rw-r--r--src/mess/drivers/specpls3.c9
9 files changed, 18 insertions, 42 deletions
diff --git a/src/emu/bus/isa/mc1502_fdc.c b/src/emu/bus/isa/mc1502_fdc.c
index 2791cb29768..9ced2603479 100644
--- a/src/emu/bus/isa/mc1502_fdc.c
+++ b/src/emu/bus/isa/mc1502_fdc.c
@@ -12,7 +12,6 @@
#include "mc1502_fdc.h"
#include "cpu/i86/i86.h"
-#include "formats/dsk_dsk.h"
#include "formats/pc_dsk.h"
#define VERBOSE_DBG 0
@@ -35,8 +34,7 @@
const device_type MC1502_FDC = &device_creator<mc1502_fdc_device>;
FLOPPY_FORMATS_MEMBER( mc1502_fdc_device::floppy_formats )
- FLOPPY_PC_FORMAT,
- FLOPPY_DSK_FORMAT
+ FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( mc1502_floppies )
diff --git a/src/emu/bus/isa/p1_fdc.c b/src/emu/bus/isa/p1_fdc.c
index 0164ce3a06a..ff45e283a2c 100644
--- a/src/emu/bus/isa/p1_fdc.c
+++ b/src/emu/bus/isa/p1_fdc.c
@@ -12,7 +12,6 @@
#include "p1_fdc.h"
#include "cpu/i86/i86.h"
-#include "formats/dsk_dsk.h"
#include "formats/pc_dsk.h"
#define VERBOSE_DBG 0
@@ -35,8 +34,7 @@
const device_type P1_FDC = &device_creator<p1_fdc_device>;
FLOPPY_FORMATS_MEMBER( p1_fdc_device::floppy_formats )
- FLOPPY_PC_FORMAT,
- FLOPPY_DSK_FORMAT
+ FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( poisk1_floppies )
diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c
index 44e2ddd28f7..a568ce37422 100644
--- a/src/emu/imagedev/floppy.c
+++ b/src/emu/imagedev/floppy.c
@@ -115,6 +115,7 @@ const floppy_format_type floppy_image_device::default_floppy_formats[] = {
FLOPPY_MFM_FORMAT,
FLOPPY_TD0_FORMAT,
FLOPPY_CQM_FORMAT,
+ FLOPPY_DSK_FORMAT,
NULL
};
diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h
index 8cc7d0d6d29..4497896c5ef 100644
--- a/src/emu/imagedev/floppy.h
+++ b/src/emu/imagedev/floppy.h
@@ -16,6 +16,7 @@
#include "formats/mfi_dsk.h"
#include "formats/td0_dsk.h"
#include "formats/cqm_dsk.h"
+#include "formats/dsk_dsk.h"
#include "ui/imgcntrl.h"
#define MCFG_FLOPPY_DRIVE_ADD(_tag, _slot_intf, _def_slot, _formats) \
@@ -38,6 +39,7 @@
FLOPPY_MFM_FORMAT, \
FLOPPY_TD0_FORMAT, \
FLOPPY_CQM_FORMAT, \
+ FLOPPY_DSK_FORMAT, \
NULL };
diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c
index ba334acdea5..5c4fc53a98d 100644
--- a/src/mess/drivers/amstrad.c
+++ b/src/mess/drivers/amstrad.c
@@ -104,7 +104,6 @@ Some bugs left :
#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
#include "formats/tzx_cas.h"
-#include "formats/dsk_dsk.h"
#include "machine/ram.h"
@@ -902,15 +901,11 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state )
MCFG_RAM_EXTRA_OPTIONS("64K,320K,576K")
MACHINE_CONFIG_END
-FLOPPY_FORMATS_MEMBER( amstrad_state::floppy_formats )
- FLOPPY_DSK_FORMAT
-FLOPPY_FORMATS_END
-
static MACHINE_CONFIG_DERIVED( amstrad, amstrad_nofdc )
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","cpc_flop")
MACHINE_CONFIG_END
@@ -987,8 +982,8 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MCFG_FRAGMENT_ADD(cpcplus_cartslot)
- MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c
index 08f894bbd09..ac8d50a1a6c 100644
--- a/src/mess/drivers/einstein.c
+++ b/src/mess/drivers/einstein.c
@@ -60,7 +60,6 @@
#include "machine/z80pio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "formats/dsk_dsk.h"
#include "sound/ay8910.h"
#include "rendlay.h"
#include "includes/einstein.h"
@@ -68,10 +67,6 @@
#define VERBOSE_KEYBOARD 0
#define VERBOSE_DISK 0
-FLOPPY_FORMATS_MEMBER( einstein_state::floppy_formats )
- FLOPPY_DSK_FORMAT
-FLOPPY_FORMATS_END
-
/***************************************************************************
80 COLUMN DEVICE
***************************************************************************/
@@ -743,10 +738,10 @@ static MACHINE_CONFIG_START( einstein, einstein_state )
MCFG_WD1770x_ADD(IC_I042, XTAL_X002)
- MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", einstein_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", einstein_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":2", einstein_floppies, "525dd", einstein_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":3", einstein_floppies, "525dd", einstein_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":2", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":3", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats)
/* software lists */
MCFG_SOFTWARE_LIST_ADD("disk_list","einstein")
diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c
index 332fdb95555..b577665d764 100644
--- a/src/mess/drivers/mbee.c
+++ b/src/mess/drivers/mbee.c
@@ -123,7 +123,6 @@
#include "includes/mbee.h"
-#include "formats/dsk_dsk.h"
#include "formats/mbee_dsk.h"
#include "formats/mbee_cas.h"
@@ -645,8 +644,7 @@ static const floppy_interface mbee_floppy_interface =
#endif
FLOPPY_FORMATS_MEMBER( mbee_state::floppy_formats )
- FLOPPY_MBEE_FORMAT,
- FLOPPY_DSK_FORMAT
+ FLOPPY_MBEE_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( mbee_floppies )
diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c
index 900eec43390..42210a6efb8 100644
--- a/src/mess/drivers/pcw.c
+++ b/src/mess/drivers/pcw.c
@@ -103,8 +103,6 @@
// pcw/pcw16 beeper
#include "sound/beep.h"
#include "machine/ram.h"
-#include "formats/pc_dsk.h"
-#include "formats/dsk_dsk.h"
#include "pcw.lh"
@@ -1254,10 +1252,6 @@ static SLOT_INTERFACE_START( pcw_floppies )
SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD )
SLOT_INTERFACE_END
-FLOPPY_FORMATS_MEMBER( pcw_state::floppy_formats )
- FLOPPY_DSK_FORMAT
-FLOPPY_FORMATS_END
-
/* PCW8256, PCW8512, PCW9256 */
static MACHINE_CONFIG_START( pcw, pcw_state )
/* basic machine hardware */
@@ -1295,8 +1289,8 @@ static MACHINE_CONFIG_START( pcw, pcw_state )
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pcw_state, pcw_fdc_interrupt))
- MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", pcw_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", pcw_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pcw")
diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c
index 060dc14f926..41a50bb80b6 100644
--- a/src/mess/drivers/specpls3.c
+++ b/src/mess/drivers/specpls3.c
@@ -154,7 +154,6 @@ http://www.z88forever.org.uk/zxplus3e/
/* +3 hardware */
#include "machine/ram.h"
-#include "formats/dsk_dsk.h"
/****************************************************************************************************/
@@ -365,10 +364,6 @@ static GFXDECODE_START( specpls3 )
GFXDECODE_END
-FLOPPY_FORMATS_MEMBER( spectrum_state::floppy_formats )
- FLOPPY_DSK_FORMAT
-FLOPPY_FORMATS_END
-
static MACHINE_CONFIG_DERIVED( spectrum_plus3, spectrum_128 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(spectrum_plus3_io)
@@ -379,8 +374,8 @@ static MACHINE_CONFIG_DERIVED( spectrum_plus3, spectrum_128 )
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_plus3 )
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", spectrum_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", spectrum_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list", "specpls3_flop")
MACHINE_CONFIG_END