Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sed1310: Cleanup. (nw)

Browse Source 
(MESS) bw2: Fixed memory mapping. (nw)
(MESS) msm6255: Refactored to use device_memory_interface. (nw)

(MESS) floppy: Added macros for declaring modern floppy formats. The generic floppy formats (D88/DFI/IMD/IPF/MFI/MFM) are now automatically supported in each driver using the modern floppy code. [Curt Coder]
This commit is contained in:
Curt Coder 2012-11-22 19:33:19 +00:00
parent 20f0cd1a58
commit 9046ce0dc5
80 changed files with 479 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emu/imagedev/floppy.c
View File

@ -25,6 +25,16 @@ const device_type FLOPPY_525_HD = &device_creator<floppy_525_hd>;
const device_type FLOPPY_8_SSSD = &device_creator<floppy_8_sssd>;
const device_type FLOPPY_8_DSDD = &device_creator<floppy_8_dsdd>;
const floppy_format_type floppy_image_device::default_floppy_formats[] = {
FLOPPY_D88_FORMAT,
FLOPPY_DFI_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_IPF_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_MFM_FORMAT,
NULL
};
floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock),
device_slot_interface(mconfig, *this)

24
src/emu/imagedev/floppy.h
View File

@ -8,12 +8,34 @@
#define FLOPPY_H
#include "formats/flopimg.h"
#include "formats/d88_dsk.h"
#include "formats/dfi_dsk.h"
#include "formats/hxcmfm_dsk.h"
#include "formats/imd_dsk.h"
#include "formats/ipf_dsk.h"
#include "formats/mfi_dsk.h"
#define MCFG_FLOPPY_DRIVE_ADD(_tag, _slot_intf, _def_slot, _def_inp, _formats) \
MCFG_DEVICE_ADD(_tag, FLOPPY_CONNECTOR, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \
static_cast<floppy_connector *>(device)->set_formats(_formats);
#define DECLARE_FLOPPY_FORMATS(_name) \
static const floppy_format_type _name [];
#define FLOPPY_FORMATS_MEMBER(_member) \
const floppy_format_type _member [] = { \
#define FLOPPY_FORMATS_END \
, \
FLOPPY_D88_FORMAT, \
FLOPPY_DFI_FORMAT, \
FLOPPY_IMD_FORMAT, \
FLOPPY_IPF_FORMAT, \
FLOPPY_MFI_FORMAT, \
FLOPPY_MFM_FORMAT, \
NULL };
/***************************************************************************
TYPE DEFINITIONS
@ -89,6 +111,8 @@ public:
virtual ui_menu *get_selection_menu(running_machine &machine, class render_container *container);
static const floppy_format_type default_floppy_formats[];
protected:
// device-level overrides
virtual void device_config_complete();

12
src/emu/machine/amigafdc.c
View File

@ -41,20 +41,14 @@
#include "emu.h"
#include "includes/amiga.h"
#include "formats/ami_dsk.h"
#include "formats/hxcmfm_dsk.h"
#include "formats/ipf_dsk.h"
#include "formats/mfi_dsk.h"
#include "formats/dfi_dsk.h"
#include "amigafdc.h"
#include "machine/6526cia.h"
const device_type AMIGA_FDC = &device_creator<amiga_fdc>;
const floppy_format_type amiga_fdc::floppy_formats[] = {
FLOPPY_ADF_FORMAT, FLOPPY_MFM_FORMAT, FLOPPY_IPF_FORMAT, FLOPPY_MFI_FORMAT, FLOPPY_DFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
FLOPPY_ADF_FORMAT
FLOPPY_FORMATS_END
amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock)

2
src/emu/machine/amigafdc.h
View File

@ -25,7 +25,7 @@ public:
void adkcon_set(UINT16 data);
void dmacon_set(UINT16 data);
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
virtual void device_start();

80
src/emu/video/msm6255.c
View File

@ -64,17 +64,43 @@ enum
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
// device type definition
const device_type MSM6255 = &device_creator<msm6255_device>;
// default address map
static ADDRESS_MAP_START( msm6255, AS_0, 8, msm6255_device )
AM_RANGE(0x00000, 0xfffff) AM_RAM
ADDRESS_MAP_END
//**************************************************************************
// INLINE HELPERS
//**************************************************************************
//-------------------------------------------------
// read_video_data - read video ROM/RAM
// read_byte -
//-------------------------------------------------
inline UINT8 msm6255_device::read_video_data(UINT16 ma, UINT8 ra)
inline UINT8 msm6255_device::read_byte(UINT16 ma, UINT8 ra)
{
return m_char_ram_r(this, ma, ra);
offs_t offset;
if (m_mor & MOR_GRAPHICS)
{
offset = ma;
}
else
{
offset = ((offs_t)ma << 4) | ra;
}
return space().read_byte(offset);
}
@ -83,41 +109,31 @@ inline UINT8 msm6255_device::read_video_data(UINT16 ma, UINT8 ra)
// LIVE DEVICE
//**************************************************************************
// device type definition
const device_type MSM6255 = &device_creator<msm6255_device>;
//-------------------------------------------------
// msm6255_device - constructor
//-------------------------------------------------
msm6255_device::msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM6255, "MSM6255", tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 20, 0, NULL, *ADDRESS_MAP_NAME(msm6255)),
m_cursor(0)
{
}
//-------------------------------------------------
// device_config_complete - perform any
// operations now that the configuration is
// complete
// static_set_config - configuration helper
//-------------------------------------------------
void msm6255_device::device_config_complete()
void msm6255_device::static_set_config(device_t &device, int char_clock, const char *screen_tag)
{
// inherit a copy of the static data
const msm6255_interface *intf = reinterpret_cast<const msm6255_interface *>(static_config());
if (intf != NULL)
{
*static_cast<msm6255_interface *>(this) = *intf;
msm6255_device &msm6255 = downcast<msm6255_device &>(device);
m_char_ram_r = intf->m_char_ram_r;
}
// or initialize to defaults if none provided
else
{
fatalerror("Interface not specified!\n");
}
assert(screen_tag != NULL);
msm6255.m_char_clock = char_clock;
msm6255.m_screen_tag = screen_tag;
}
@ -156,6 +172,17 @@ void msm6255_device::device_reset()
}
//-------------------------------------------------
// memory_space_config - return a description of
// any address spaces owned by this device
//-------------------------------------------------
const address_space_config *msm6255_device::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_0) ? &m_space_config : NULL;
}
//-------------------------------------------------
// read - register read
//-------------------------------------------------
@ -329,7 +356,7 @@ void msm6255_device::draw_scanline(bitmap_ind16 &bitmap, const rectangle &clipre
for (sx = 0; sx < hn; sx++)
{
UINT8 data = read_video_data(ma, ra);
UINT8 data = read_byte(ma, ra);
if (m_cursor)
{
@ -373,11 +400,11 @@ void msm6255_device::update_graphics(bitmap_ind16 &bitmap, const rectangle &clip
{
// draw upper half scanline
UINT16 ma = sar + (y * hn);
draw_scanline(bitmap, cliprect, y, ma, 0);
draw_scanline(bitmap, cliprect, y, ma);
// draw lower half scanline
ma = sar + ((y + nx) * hn);
draw_scanline(bitmap, cliprect, y + nx, ma, 0);
draw_scanline(bitmap, cliprect, y + nx, ma);
}
}
@ -432,7 +459,8 @@ UINT32 msm6255_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap
}
else
{
bitmap.fill(get_black_pen(machine()), cliprect);
bitmap.fill(0, cliprect);
}
return 0;
}

53
src/emu/video/msm6255.h
View File

@ -20,17 +20,10 @@
// INTERFACE CONFIGURATION MACROS
///*************************************************************************
#define MCFG_MSM6255_ADD(_tag, _clock, _config) \
#define MCFG_MSM6255_ADD(_tag, _clock, _char_clock, _screen_tag, _map) \
MCFG_DEVICE_ADD(_tag, MSM6255, _clock) \
MCFG_DEVICE_CONFIG(_config)
#define MSM6255_INTERFACE(name) \
const msm6255_interface (name) =
#define MSM6255_CHAR_RAM_READ(_name) \
UINT8 _name(device_t *device, UINT16 ma, UINT8 ra)
MCFG_DEVICE_ADDRESS_MAP(AS_0, _map) \
msm6255_device::static_set_config(*device, _char_clock, _screen_tag);
@ -38,33 +31,18 @@
// TYPE DEFINITIONS
///*************************************************************************
// ======================> msm6255_char_ram_read_func
typedef UINT8 (*msm6255_char_ram_read_func)(device_t *device, UINT16 ma, UINT8 ra);
// ======================> msm6255_interface
struct msm6255_interface
{
const char *m_screen_tag;
int m_character_clock;
// ROM/RAM data read function
msm6255_char_ram_read_func m_char_ram_r;
};
// ======================> msm6255_device
class msm6255_device : public device_t,
public msm6255_interface
public device_memory_interface
{
public:
// construction/destruction
msm6255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_config(device_t &device, int char_clock, const char *screen_tag);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@ -72,18 +50,25 @@ public:
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
virtual void device_config_complete() { m_shortname = "msm6255"; }
virtual void device_start();
virtual void device_reset();
// device_memory_interface overrides
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
private:
inline UINT8 read_video_data(UINT16 ma, UINT8 ra);
inline UINT8 read_byte(UINT16 ma, UINT8 ra);
void update_cursor();
void draw_scanline(bitmap_ind16 &bitmap, const rectangle &cliprect, int y, UINT16 ma, UINT8 ra);
void draw_scanline(bitmap_ind16 &bitmap, const rectangle &cliprect, int y, UINT16 ma, UINT8 ra = 0);
void update_graphics(bitmap_ind16 &bitmap, const rectangle &cliprect);
void update_text(bitmap_ind16 &bitmap, const rectangle &cliprect);
const address_space_config m_space_config;
const char *m_screen_tag;
screen_device *m_screen;
int m_char_clock;
UINT8 m_ir; // instruction register
UINT8 m_mor; // mode control register

3
src/emu/video/sed1330.c
View File

@ -140,12 +140,11 @@ inline void sed1330_device::increment_csr()
//-------------------------------------------------
sed1330_device::sed1330_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SED1330, "Seiko-Epson SED1330", tag, owner, clock),
: device_t(mconfig, SED1330, "SED1330", tag, owner, clock),
device_memory_interface(mconfig, *this),
m_bf(0),
m_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(sed1330))
{
m_shortname = "sed1330";
}

5
src/emu/video/sed1330.h
View File

@ -43,6 +43,9 @@ public:
// inline configuration helpers
static void static_set_config(device_t &device, const char *screen_tag);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
DECLARE_READ8_MEMBER( status_r );
DECLARE_WRITE8_MEMBER( command_w );
@ -53,7 +56,7 @@ public:
protected:
// device-level overrides
virtual const rom_entry *device_rom_region() const;
virtual void device_config_complete() { m_shortname = "sed1330"; }
virtual void device_start();
virtual void device_reset();

17
src/mess/drivers/a5105.c
View File

@ -67,6 +67,7 @@ public:
virtual void machine_reset();
virtual void video_start();
virtual void palette_init();
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
/* TODO */
@ -520,11 +521,9 @@ static ADDRESS_MAP_START( upd7220_map, AS_0, 8, a5105_state)
AM_RANGE(0x00000, 0x1ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
static const floppy_format_type a5105_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
FLOPPY_A5105_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( a5105_state::floppy_formats )
FLOPPY_A5105_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( a5105_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
@ -588,10 +587,10 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_UPD765A_ADD("upd765a", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", a5105_floppies, "525dd", 0, a5105_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:1", a5105_floppies, "525dd", 0, a5105_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:2", a5105_floppies, "525dd", 0, a5105_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:3", a5105_floppies, "525dd", 0, a5105_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", a5105_floppies, "525dd", 0, a5105_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:1", a5105_floppies, "525dd", 0, a5105_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:2", a5105_floppies, "525dd", 0, a5105_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765a:3", a5105_floppies, "525dd", 0, a5105_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

23
src/mess/drivers/amstrad.c
View File

@ -806,17 +806,6 @@ static const cassette_interface amstrad_cassette_interface =
NULL
};
static const floppy_format_type amstrad_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static const floppy_format_type aleste_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( amstrad_floppies )
SLOT_INTERFACE( "3ssdd", FLOPPY_3_SSDD )
SLOT_INTERFACE_END
@ -899,8 +888,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( amstrad, amstrad_nofdc )
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, amstrad_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, amstrad_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","cpc_flop")
MACHINE_CONFIG_END
@ -962,8 +951,8 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MCFG_FRAGMENT_ADD(cpcplus_cartslot)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, amstrad_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, amstrad_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL,NULL)
@ -1029,8 +1018,8 @@ static MACHINE_CONFIG_DERIVED( aleste, amstrad )
MCFG_DEVICE_REMOVE("upd765")
MCFG_I8272A_ADD("upd765", true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "525hd", 0, aleste_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "525hd", 0, aleste_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)

7
src/mess/drivers/atarist.c
View File

@ -2305,10 +2305,9 @@ void stbook_state::machine_start()
ste_state::state_save();
}
const floppy_format_type st_state::floppy_formats[] = {
FLOPPY_ST_FORMAT, FLOPPY_MSA_FORMAT, FLOPPY_PASTI_FORMAT, FLOPPY_IPF_FORMAT, FLOPPY_MFI_FORMAT, FLOPPY_DFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( st_state::floppy_formats )
FLOPPY_ST_FORMAT, FLOPPY_MSA_FORMAT, FLOPPY_PASTI_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( atari_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )

9
src/mess/drivers/b2m.c
View File

@ -184,11 +184,6 @@ static LEGACY_FLOPPY_OPTIONS_START(b2m)
LEGACY_FLOPPY_OPTIONS_END
*/
static const floppy_format_type floppy_formats[] = {
FLOPPY_MFM_FORMAT, FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( b2m_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -234,8 +229,8 @@ static MACHINE_CONFIG_START( b2m, b2m_state )
MCFG_WD1773x_ADD("wd1793", XTAL_8MHz )
MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525dd", 0, floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525dd", 0, floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

13
src/mess/drivers/bebox.c
View File

@ -18,7 +18,6 @@
#include "machine/ins8250.h"
#include "machine/pic8259.h"
#include "machine/mc146818.h"
#include "machine/upd765.h"
#include "machine/pci.h"
#include "machine/8237dma.h"
#include "machine/pckeybrd.h"
@ -33,8 +32,6 @@
/* Devices */
#include "machine/scsicd.h"
#include "machine/scsihd.h"
#include "imagedev/flopdrv.h"
#include "formats/mfi_dsk.h"
#include "formats/pc_dsk.h"
#include "machine/ram.h"
@ -131,11 +128,9 @@ static const struct LSI53C810interface lsi53c810_intf =
};
static const floppy_format_type bebox_floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( bebox_state::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( bebox_floppies )
SLOT_INTERFACE( "35hd", FLOPPY_35_HD )
@ -203,7 +198,7 @@ static MACHINE_CONFIG_START( bebox, bebox_state )
/*MCFG_PCI_BUS_DEVICE(12, NULL, scsi53c810_pci_read, scsi53c810_pci_write)*/
MCFG_SMC37C78_ADD("smc37c78")
MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", 0, bebox_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", 0, bebox_state::floppy_formats)
MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )

28
src/mess/drivers/bw12.c
View File

@ -613,25 +613,17 @@ static SLOT_INTERFACE_START( bw12_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_SSDD )
SLOT_INTERFACE_END
static const floppy_format_type bw12_floppy_formats[] = {
FLOPPY_BW12_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_MFM_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( bw12_state::bw12_floppy_formats )
FLOPPY_BW12_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( bw14_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
static const floppy_format_type bw14_floppy_formats[] = {
FLOPPY_BW12_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_MFM_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( bw12_state::bw14_floppy_formats )
FLOPPY_BW12_FORMAT
FLOPPY_FORMATS_END
/* F4 Character Displayer */
static const gfx_layout bw12_charlayout =
@ -691,8 +683,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bw12, common )
/* floppy drives */
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw12_floppies, "525dd", 0, bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", 0, bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw12_floppies, "525dd", 0, bw12_state::bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", 0, bw12_state::bw12_floppy_formats)
// software lists
MCFG_SOFTWARE_LIST_ADD("flop_list", "bw12")
@ -704,8 +696,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bw14, common )
/* floppy drives */
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw14_floppies, "525dd", 0, bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", 0, bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw14_floppies, "525dd", 0, bw12_state::bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", 0, bw12_state::bw14_floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

206
src/mess/drivers/bw2.c
View File

@ -42,6 +42,8 @@ enum
ROM
};
#define HAS_KB_OF_RAM(_kb) \
(m_ram->size() >= (_kb * 1024))
//**************************************************************************
@ -70,46 +72,53 @@ READ8_MEMBER( bw2_state::read )
case ROM: rom = 0; break;
}
if (!rom)
if (offset < 0x8000)
{
data = memregion(Z80_TAG)->base()[offset & 0x3fff];
}
if (!rom)
{
data = memregion(Z80_TAG)->base()[offset & 0x3fff];
}
if (!vram)
{
data = m_video_ram[offset & 0x3fff];
}
if (!vram)
{
data = m_video_ram[offset & 0x3fff];
}
if (!ram1)
if (!ram1)
{
data = m_ram->pointer()[offset];
}
if (!ram2 && HAS_KB_OF_RAM(96))
{
data = m_ram->pointer()[0x10000 | offset];
}
if (!ram3 && HAS_KB_OF_RAM(128))
{
data = m_ram->pointer()[0x18000 | offset];
}
if (!ram4 && HAS_KB_OF_RAM(160))
{
data = m_ram->pointer()[0x20000 | offset];
}
if (!ram5 && HAS_KB_OF_RAM(192))
{
data = m_ram->pointer()[0x28000 | offset];
}
if (!ram6 && HAS_KB_OF_RAM(224))
{
data = m_ram->pointer()[0x30000 | offset];
}
}
else
{
data = m_ram->pointer()[offset];
}
if (!ram2 && (m_ram->size() >= 96 * 1024))
{
data = m_ram->pointer()[0x10000 | offset];
}
if (!ram3 && (m_ram->size() >= 128 * 1024))
{
data = m_ram->pointer()[0x18000 | offset];
}
if (!ram4 && (m_ram->size() >= 160 * 1024))
{
data = m_ram->pointer()[0x20000 | offset];
}
if (!ram5 && (m_ram->size() >= 192 * 1024))
{
data = m_ram->pointer()[0x28000 | offset];
}
if (!ram6 && (m_ram->size() >= 224 * 1024))
{
data = m_ram->pointer()[0x30000 | offset];
}
return m_exp->cd_r(space, offset, data, ram2, ram3, ram4, ram5, ram6);
}
@ -133,41 +142,48 @@ WRITE8_MEMBER( bw2_state::write )
case RAM6: ram6 = 0; break;
}
if (!vram)
if (offset < 0x8000)
{
m_video_ram[offset & 0x3fff] = data;
}
if (!vram)
{
m_video_ram[offset & 0x3fff] = data;
}
if (!ram1)
if (!ram1)
{
m_ram->pointer()[offset] = data;
}
if (!ram2 && HAS_KB_OF_RAM(96))
{
m_ram->pointer()[0x10000 | offset] = data;
}
if (!ram3 && HAS_KB_OF_RAM(128))
{
m_ram->pointer()[0x18000 | offset] = data;
}
if (!ram4 && HAS_KB_OF_RAM(160))
{
m_ram->pointer()[0x20000 | offset] = data;
}
if (!ram5 && HAS_KB_OF_RAM(192))
{
m_ram->pointer()[0x28000 | offset] = data;
}
if (!ram6 && HAS_KB_OF_RAM(224))
{
m_ram->pointer()[0x30000 | offset] = data;
}
}
else
{
m_ram->pointer()[offset] = data;
}
if (!ram2 && (m_ram->size() >= 96 * 1024))
{
m_ram->pointer()[0x10000 | offset] = data;
}
if (!ram3 && (m_ram->size() >= 128 * 1024))
{
m_ram->pointer()[0x18000 | offset] = data;
}
if (!ram4 && (m_ram->size() >= 160 * 1024))
{
m_ram->pointer()[0x20000 | offset] = data;
}
if (!ram5 && (m_ram->size() >= 192 * 1024))
{
m_ram->pointer()[0x28000 | offset] = data;
}
if (!ram6 && (m_ram->size() >= 224 * 1024))
{
m_ram->pointer()[0x30000 | offset] = data;
}
m_exp->cd_w(space, offset, data, ram2, ram3, ram4, ram5, ram6);
}
@ -183,8 +199,7 @@ WRITE8_MEMBER( bw2_state::write )
static ADDRESS_MAP_START( bw2_mem, AS_PROGRAM, 8, bw2_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(read, write)
AM_RANGE(0x8000, 0xffff) AM_RAM
AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write)
ADDRESS_MAP_END
@ -207,6 +222,16 @@ static ADDRESS_MAP_START( bw2_io, AS_IO, 8, bw2_state )
ADDRESS_MAP_END
//-------------------------------------------------
// ADDRESS_MAP( lcdc_map )
//-------------------------------------------------
static ADDRESS_MAP_START( lcdc_map, AS_0, 8, bw2_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("videoram")
ADDRESS_MAP_END
//**************************************************************************
// INPUT PORTS
@ -511,44 +536,17 @@ static const struct pit8253_config pit_intf =
};
//-------------------------------------------------
// MSM6255_INTERFACE( lcdc_intf )
//-------------------------------------------------
void bw2_state::palette_init()
{
palette_set_color_rgb(machine(), 0, 0xa5, 0xad, 0xa5);
palette_set_color_rgb(machine(), 1, 0x31, 0x39, 0x10);
}
static MSM6255_CHAR_RAM_READ( bw2_charram_r )
{
bw2_state *state = device->machine().driver_data<bw2_state>();
return state->m_video_ram[ma & 0x3fff];
}
static MSM6255_INTERFACE( lcdc_intf )
{
SCREEN_TAG,
0,
bw2_charram_r,
};
//-------------------------------------------------
// floppy_format_type floppy_formats
//-------------------------------------------------
void bw2_state::fdc_intrq_w(bool state)
{
logerror("intrq %u\n", state?1:0);
m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE);
}
void bw2_state::fdc_drq_w(bool state)
{
logerror("drq %u\n", state?1:0);
if (state)
{
if (m_maincpu->state_int(Z80_HALT))
@ -562,13 +560,9 @@ void bw2_state::fdc_drq_w(bool state)
}
}
const floppy_format_type bw2_state::floppy_formats[] = {
FLOPPY_BW2_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFM_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( bw2_state::floppy_formats )
FLOPPY_BW2_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( bw2_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) // Teac FD-35
@ -597,15 +591,23 @@ static const rs232_port_interface rs232_intf =
// MACHINE INITIALIZATION
//**************************************************************************
//-------------------------------------------------
// PALETTE_INIT( bw2 )
//-------------------------------------------------
void bw2_state::palette_init()
{
palette_set_color_rgb(machine(), 0, 0xa5, 0xad, 0xa5);
palette_set_color_rgb(machine(), 1, 0x31, 0x39, 0x10);
}
//-------------------------------------------------
// MACHINE_START( bw2 )
//-------------------------------------------------
void bw2_state::machine_start()
{
// allocate memory
m_video_ram.allocate(0x4000);
// floppy callbacks
m_fdc->setup_intrq_cb(wd2797_t::line_cb(FUNC(bw2_state::fdc_intrq_w), this));
m_fdc->setup_drq_cb(wd2797_t::line_cb(FUNC(bw2_state::fdc_drq_w), this));
@ -645,7 +647,7 @@ static MACHINE_CONFIG_START( bw2, bw2_state )
// devices
MCFG_PIT8253_ADD(I8253_TAG, pit_intf)
MCFG_I8255A_ADD(I8255A_TAG, ppi_intf)
MCFG_MSM6255_ADD(MSM6255_TAG, XTAL_16MHz, lcdc_intf)
MCFG_MSM6255_ADD(MSM6255_TAG, XTAL_16MHz, 0, SCREEN_TAG, lcdc_map)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_I8251_ADD(I8251_TAG, default_i8251_interface)
MCFG_WD2797x_ADD(WD2797_TAG, XTAL_16MHz/16)

14
src/mess/drivers/compis.c
View File

@ -335,12 +335,6 @@ static const mm58274c_interface compis_mm58274c_interface =
1 /* first day of week */
};
static const floppy_format_type compis_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( compis_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
@ -386,8 +380,8 @@ static MACHINE_CONFIG_START( compis, compis_state )
MCFG_I8251_ADD("uart", compis_usart_interface)
MCFG_MM58274C_ADD("mm58274c", compis_mm58274c_interface)
MCFG_I8272A_ADD("i8272a", true)
MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, compis_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, compis_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_COMPIS_KEYBOARD_ADD()
/* software lists */
@ -426,8 +420,8 @@ static MACHINE_CONFIG_START( compis2, compis_state )
MCFG_I8251_ADD("uart", compis_usart_interface)
MCFG_MM58274C_ADD("mm58274c", compis_mm58274c_interface)
MCFG_I8272A_ADD("i8272a", true)
MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, compis_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, compis_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_COMPIS_KEYBOARD_ADD()
/* software lists */

9
src/mess/drivers/dmv.c
View File

@ -180,11 +180,6 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text )
}
}
static const floppy_format_type dmv_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( dmv_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -333,8 +328,8 @@ static MACHINE_CONFIG_START( dmv, dmv_state )
MCFG_UPD7220_ADD( "upd7220", XTAL_4MHz, hgdc_intf, upd7220_map )
MCFG_I8237_ADD( "dma8237", XTAL_4MHz, dmv_dma8237_config )
MCFG_UPD765A_ADD( "upd765", true, true )
MCFG_FLOPPY_DRIVE_ADD("upd765:0", dmv_floppies, "525dd", 0, dmv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", dmv_floppies, "525dd", 0, dmv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", dmv_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", dmv_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
/* ROM definition */

7
src/mess/drivers/einstein.c
View File

@ -77,10 +77,9 @@
#define VERBOSE_KEYBOARD 0
#define VERBOSE_DISK 0
const floppy_format_type einstein_state::floppy_formats[] = {
FLOPPY_DSK_FORMAT, FLOPPY_MFM_FORMAT, FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( einstein_state::floppy_formats )
FLOPPY_DSK_FORMAT
FLOPPY_FORMATS_END
/***************************************************************************
80 COLUMN DEVICE

9
src/mess/drivers/elwro800.c
View File

@ -534,11 +534,6 @@ INTERRUPT_GEN_MEMBER(elwro800_state::elwro800jr_interrupt)
device.execute().set_input_line(0, HOLD_LINE);
}
static const floppy_format_type elwro800jr_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( elwro800jr_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -604,8 +599,8 @@ static MACHINE_CONFIG_START( elwro800, elwro800_state )
MCFG_CASSETTE_ADD( CASSETTE_TAG, elwro800jr_cassette_interface )
MCFG_FLOPPY_DRIVE_ADD("upd765:0", elwro800jr_floppies, "525hd", 0, elwro800jr_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", elwro800jr_floppies, "525hd", 0, elwro800jr_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

9
src/mess/drivers/esq5505.c
View File

@ -94,7 +94,7 @@ public:
UINT8 m_duart_io;
bool m_bCalibSecondByte;
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
private:
UINT16 es5510_dsp_ram[0x200];
@ -113,10 +113,9 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
};
const floppy_format_type esq5505_state::floppy_formats[] = {
FLOPPY_ESQIMG_FORMAT, FLOPPY_IPF_FORMAT, FLOPPY_MFI_FORMAT, FLOPPY_DFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( esq5505_state::floppy_formats )
FLOPPY_ESQIMG_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( ensoniq_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )

17
src/mess/drivers/hec2hrp.c
View File

@ -516,11 +516,6 @@ static MACHINE_CONFIG_START( hec2hrp, hec2hrp_state )
MACHINE_CONFIG_END
static const floppy_format_type hector_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( hector_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -539,8 +534,8 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state )
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
@ -591,8 +586,8 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state )
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -690,8 +685,8 @@ static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state )
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, hector_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)

16
src/mess/drivers/ht68k.c
View File

@ -46,8 +46,6 @@ public:
m_p_ram(*this, "p_ram"){ }
static const floppy_format_type floppy_formats[];
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
required_device<device_t> m_duart;
@ -59,12 +57,6 @@ public:
};
const floppy_format_type ht68k_state::floppy_formats[] = {
FLOPPY_MFM_FORMAT, FLOPPY_MFI_FORMAT,
NULL
};
static ADDRESS_MAP_START(ht68k_mem, AS_PROGRAM, 16, ht68k_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("p_ram") // 512 KB RAM / ROM at boot
@ -159,10 +151,10 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state )
MCFG_WD1770x_ADD("wd1770", XTAL_8MHz )
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:2", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:3", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:2", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:3", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
/* ROM definition */

10
src/mess/drivers/m5.c
View File

@ -560,11 +560,9 @@ static I8255_INTERFACE( ppi_intf )
// upd765_interface fdc_intf
//-------------------------------------------------
static const floppy_format_type m5_floppy_formats[] = {
FLOPPY_M5_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( m5_state::floppy_formats )
FLOPPY_M5_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( m5_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
@ -665,7 +663,7 @@ static MACHINE_CONFIG_START( m5, m5_state )
MCFG_CASSETTE_ADD(CASSETTE_TAG, cassette_intf)
MCFG_I8255_ADD(I8255A_TAG, ppi_intf)
MCFG_UPD765A_ADD(UPD765_TAG, true, true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", m5_floppies, "525dd", 0, m5_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", m5_floppies, "525dd", 0, m5_state::floppy_formats)
// cartridge
MCFG_CARTSLOT_ADD("cart")

9
src/mess/drivers/microdec.c
View File

@ -88,11 +88,6 @@ void microdec_state::fdc_irq(bool state)
{
}
static const floppy_format_type microdec_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( microdec_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -108,8 +103,8 @@ static MACHINE_CONFIG_START( microdec, microdec_state )
MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", microdec_floppies, "525hd", 0, microdec_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", microdec_floppies, "525hd", 0, microdec_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", microdec_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", microdec_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
/* ROM definition */

24
src/mess/drivers/mikromik.c
View File

@ -683,18 +683,14 @@ static I8085_CONFIG( i8085_intf )
// upd765_interface fdc_intf
//-------------------------------------------------
static const floppy_format_type mm1_floppy_formats[] = {
FLOPPY_MM1_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static const floppy_format_type mm2_floppy_formats[] = {
FLOPPY_MM2_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( mm1_state::floppy_formats )
FLOPPY_MM1_FORMAT
FLOPPY_FORMATS_END
/*
FLOPPY_FORMATS_MEMBER( mm2_state::floppy_formats )
FLOPPY_MM2_FORMAT
FLOPPY_FORMATS_END
*/
static SLOT_INTERFACE_START( mm1_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
@ -786,8 +782,8 @@ static MACHINE_CONFIG_START( mm1, mm1_state )
MCFG_UPD765A_ADD(UPD765_TAG, /* XTAL_16MHz/2/2 */ true, true)
MCFG_UPD7201_ADD(UPD7201_TAG, XTAL_6_144MHz/2, mpsc_intf)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", 0, mm1_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", 0, mm1_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", 0, mm1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", 0, mm1_state::floppy_formats)
// internal ram
MCFG_RAM_ADD(RAM_TAG)

9
src/mess/drivers/mirage.c
View File

@ -90,7 +90,7 @@ public:
int last_sndram_bank;
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
void fdc_intrq_w(bool state);
DECLARE_DRIVER_INIT(mirage);
@ -106,10 +106,9 @@ public:
DECLARE_READ8_MEMBER(mirage_via_read_cb2);
};
const floppy_format_type mirage_state::floppy_formats[] = {
FLOPPY_ESQ8IMG_FORMAT, FLOPPY_IPF_FORMAT, FLOPPY_MFI_FORMAT, FLOPPY_DFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( mirage_state::floppy_formats )
FLOPPY_ESQ8IMG_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( ensoniq_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )

9
src/mess/drivers/mz6500.c
View File

@ -119,11 +119,6 @@ void mz6500_state::fdc_drq(bool state)
//printf("%02x DRQ\n",state);
}
static const floppy_format_type mz6500_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( mz6500_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -162,8 +157,8 @@ static MACHINE_CONFIG_START( mz6500, mz6500_state )
/* Devices */
MCFG_UPD7220_ADD("upd7220", 4000000, hgdc_intf, upd7220_map)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", mz6500_floppies, "525hd", 0, mz6500_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", mz6500_floppies, "525hd", 0, mz6500_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", mz6500_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", mz6500_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
/* ROM definition */

11
src/mess/drivers/nanos.c
View File

@ -62,6 +62,7 @@ public:
DECLARE_READ8_MEMBER(nanos_port_a_r);
DECLARE_READ8_MEMBER(nanos_port_b_r);
DECLARE_WRITE8_MEMBER(nanos_port_b_w);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
@ -463,11 +464,9 @@ static Z80PIO_INTERFACE( nanos_z80pio_intf )
DEVCB_NULL
};
static const floppy_format_type nanos_floppy_formats[] = {
FLOPPY_NANOS_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( nanos_state::floppy_formats )
FLOPPY_NANOS_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( nanos_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -519,7 +518,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state )
MCFG_Z80PIO_ADD( "z80pio", XTAL_4MHz, nanos_z80pio_intf )
/* UPD765 */
MCFG_UPD765A_ADD("upd765", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", nanos_floppies, "525hd", 0, nanos_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", nanos_floppies, "525hd", 0, nanos_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

9
src/mess/drivers/newbrain.c
View File

@ -1389,11 +1389,6 @@ static MACHINE_CONFIG_START( newbrain_a, newbrain_state )
MCFG_RAM_DEFAULT_SIZE("32K")
MACHINE_CONFIG_END
static const floppy_format_type newbrain_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( newbrain_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -1413,8 +1408,8 @@ static MACHINE_CONFIG_DERIVED_CLASS( newbrain_eim, newbrain_a, newbrain_eim_stat
MCFG_ADC0808_ADD(ADC0809_TAG, 500000, adc_intf)
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
MCFG_UPD765A_ADD(UPD765_TAG, false, true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", newbrain_floppies, "525dd", 0, newbrain_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", newbrain_floppies, "525dd", 0, newbrain_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", newbrain_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", newbrain_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
// internal ram
MCFG_RAM_MODIFY(RAM_TAG)

8
src/mess/drivers/next.c
View File

@ -918,11 +918,9 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( next )
INPUT_PORTS_END
const floppy_format_type next_state::floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( next_state::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( next_floppies )
SLOT_INTERFACE( "35ed", FLOPPY_35_ED )

9
src/mess/drivers/p8k.c
View File

@ -374,11 +374,6 @@ void p8k_state::machine_start()
}
}
static const floppy_format_type p8k_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( p8k_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -731,8 +726,8 @@ static MACHINE_CONFIG_START( p8k, p8k_state )
MCFG_Z80PIO_ADD("z80pio_1", 1229000, p8k_pio_1_intf)
MCFG_Z80PIO_ADD("z80pio_2", 1229000, p8k_pio_2_intf)
MCFG_I8272A_ADD("i8272", true)
MCFG_FLOPPY_DRIVE_ADD("i8272:0", p8k_floppies, "525hd", 0, p8k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272:1", p8k_floppies, "525hd", 0, p8k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272:0", p8k_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272:1", p8k_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")

9
src/mess/drivers/pasopia7.c
View File

@ -977,11 +977,6 @@ void pasopia7_state::fdc_irq(bool state)
m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const floppy_format_type pasopia7_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pasopia7_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -1026,8 +1021,8 @@ static MACHINE_CONFIG_START( p7_base, pasopia7_state )
MCFG_I8255_ADD( "ppi8255_1", ppi8255_intf_1 )
MCFG_I8255_ADD( "ppi8255_2", ppi8255_intf_2 )
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pasopia7_floppies, "525hd", 0, pasopia7_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pasopia7_floppies, "525hd", 0, pasopia7_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pasopia7_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pasopia7_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( p7_raster, p7_base )

60
src/mess/drivers/pc.c
View File

@ -857,11 +857,9 @@ static const pc_lpt_interface pc_lpt_config =
DEVCB_CPU_INPUT_LINE("maincpu", 0)
};
static const floppy_format_type ibmpc_floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( pc_state::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( ibmpc_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
@ -996,8 +994,8 @@ static MACHINE_CONFIG_START( pccga, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1077,8 +1075,8 @@ static MACHINE_CONFIG_START( europc, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1127,8 +1125,8 @@ static MACHINE_CONFIG_START( t1000hx, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1177,8 +1175,8 @@ static MACHINE_CONFIG_START( t1000_16, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1227,8 +1225,8 @@ static MACHINE_CONFIG_START( t1000_286, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1300,7 +1298,7 @@ static MACHINE_CONFIG_START( ibmpcjr, pc_state )
MCFG_PC_FDC_JR_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* cartridge */
MCFG_CARTSLOT_ADD("cart1")
@ -1374,7 +1372,7 @@ static MACHINE_CONFIG_START( mc1502, pc_state )
MCFG_CASSETTE_ADD( CASSETTE_TAG, mc1502_cassette_interface ) // has no motor control
MCFG_FD1793_ADD( "vg93", default_wd17xx_interface_2_drives )
MCFG_FLOPPY_DRIVE_ADD(FLOPPY_0, ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FLOPPY_0, ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1418,8 +1416,8 @@ static MACHINE_CONFIG_START( ec1841, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* keyboard -- needs dump */
MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf)
@ -1478,8 +1476,8 @@ static MACHINE_CONFIG_START( iskr1031, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1532,8 +1530,8 @@ static MACHINE_CONFIG_START( iskr3104, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1587,8 +1585,8 @@ static MACHINE_CONFIG_START( poisk2, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1641,8 +1639,8 @@ static MACHINE_CONFIG_START( zenith, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1695,8 +1693,8 @@ static MACHINE_CONFIG_START( olivetti, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -1749,8 +1747,8 @@ static MACHINE_CONFIG_START( ibm5550, pc_state )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

10
src/mess/drivers/pc100.c
View File

@ -472,12 +472,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(pc100_state::pc100_10hz_irq)
}
}
static const floppy_format_type pc100_floppy_formats[] = {
FLOPPY_D88_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pc100_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -506,8 +500,8 @@ static MACHINE_CONFIG_START( pc100, pc100_state )
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_MSM58321_ADD("rtc", XTAL_32_768kHz, rtc_intf)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc100_floppies, "525hd", 0, pc100_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc100_floppies, "525hd", 0, pc100_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc100_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc100_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)

16
src/mess/drivers/pc1512.c
View File

@ -1092,11 +1092,9 @@ static const isa8bus_interface isabus_intf =
DEVCB_DEVICE_LINE_MEMBER(I8237A5_TAG, am9517a_device, dreq3_w)
};
static const floppy_format_type ibmpc_floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( pc1512_state::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( ibmpc_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
@ -1267,8 +1265,8 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state )
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats)
// ISA8 bus
MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, I8086_TAG, isabus_intf)
@ -1312,8 +1310,8 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state )
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats)
// ISA8 bus
MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, I8086_TAG, isabus_intf)

11
src/mess/drivers/pc8801.c
View File

@ -2271,13 +2271,6 @@ static UPD1990A_INTERFACE( pc8801_upd1990a_intf )
/* Floppy Configuration */
static const floppy_format_type pc88_floppy_formats[] = {
FLOPPY_D88_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pc88_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -2702,8 +2695,8 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
MCFG_I8251_ADD(I8251_TAG, uart_intf)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88_floppies, "525hd", 0, pc88_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88_floppies, "525hd", 0, pc88_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pc8801_flop")
/* video hardware */

14
src/mess/drivers/pc88va.c
View File

@ -143,6 +143,7 @@ public:
void fdc_irq(bool state);
void fdc_drq(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
@ -1731,12 +1732,9 @@ static const upd71071_intf pc88va_dma_config =
{ 0, 0, m_fdc_dma_w, 0 }
};
static const floppy_format_type pc88va_floppy_formats[] = {
FLOPPY_XDF_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_D88_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( pc88va_state::floppy_formats )
FLOPPY_XDF_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( pc88va_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -1778,8 +1776,8 @@ static MACHINE_CONFIG_START( pc88va, pc88va_state )
MCFG_UPD71071_ADD("dmac",pc88va_dma_config)
MCFG_UPD765A_ADD("upd765", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88va_floppies, "525hd", 0, pc88va_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88va_floppies, "525hd", 0, pc88va_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88va_floppies, "525hd", 0, pc88va_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88va_floppies, "525hd", 0, pc88va_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pc88va")
MCFG_PIT8253_ADD("pit8253",pc88va_pit8253_config)

22
src/mess/drivers/pc9801.c
View File

@ -2449,12 +2449,6 @@ static I8255A_INTERFACE( ppi_fdd_intf )
*
****************************************/
static const floppy_format_type pc9801_floppy_formats[] = {
FLOPPY_D88_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pc9801_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -2680,10 +2674,10 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state )
MCFG_UPD765A_ADD("upd765_2hd", false, true)
MCFG_UPD765A_ADD("upd765_2dd", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pc98")
@ -2747,8 +2741,8 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state )
MCFG_UPD765A_ADD("upd765_2hd", false, true)
//"upd765_2dd"
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
@ -2808,8 +2802,8 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state )
MCFG_UPD765A_ADD("upd765_2hd", false, true)
//"upd765_2dd"
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")

9
src/mess/drivers/pcw.c
View File

@ -1266,11 +1266,6 @@ static INPUT_PORTS_START(pcw)
PORT_BIT( 0xff, 0x00, IPT_UNUSED)
INPUT_PORTS_END
static const floppy_format_type pcw_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pcw_floppies )
SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD )
SLOT_INTERFACE_END
@ -1310,8 +1305,8 @@ static MACHINE_CONFIG_START( pcw, pcw_state )
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", 0, pcw_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", 0, pcw_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", 0, floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pcw")

12
src/mess/drivers/pcw16.c
View File

@ -971,11 +971,9 @@ static const ins8250_interface pcw16_com_interface[2]=
}
};
static const floppy_format_type pcw16_floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( pcw16_state::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( pcw16_floppies )
SLOT_INTERFACE( "35hd", FLOPPY_35_HD )
@ -1097,8 +1095,8 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state )
/* printer */
MCFG_PC_LPT_ADD("lpt", pcw16_lpt_config)
MCFG_PC_FDC_SUPERIO_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", 0, pcw16_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", 0, pcw16_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", 0, pcw16_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", 0, pcw16_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pcw16")

13
src/mess/drivers/prof180x.c
View File

@ -185,11 +185,6 @@ INPUT_PORTS_END
/* Video */
static const floppy_format_type prof180x_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( prof180x_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -237,10 +232,10 @@ static MACHINE_CONFIG_START( prof180x, prof180x_state )
/* devices */
MCFG_UPD765A_ADD(FDC9268_TAG, false, true)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":0", prof180x_floppies, "525hd", 0, prof180x_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":1", prof180x_floppies, "525hd", 0, prof180x_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":2", prof180x_floppies, "525hd", 0, prof180x_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "525hd", 0, prof180x_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":0", prof180x_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":1", prof180x_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":2", prof180x_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
//MCFG_RTC8583_ADD(MK3835_TAG, rtc_intf)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)

9
src/mess/drivers/prof80.c
View File

@ -507,11 +507,6 @@ static UPD1990A_INTERFACE( rtc_intf )
// upd765_interface fdc_intf
//-------------------------------------------------
static const floppy_format_type prof80_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( prof80_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -623,8 +618,8 @@ static MACHINE_CONFIG_START( prof80, prof80_state )
// devices
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, rtc_intf)
MCFG_UPD765A_ADD(UPD765_TAG, false, true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", prof80_floppies, "525hd", 0, prof80_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", prof80_floppies, "525hd", 0, prof80_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", prof80_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", prof80_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
// ECB bus
MCFG_ECBBUS_ADD(Z80_TAG, ecb_intf)

13
src/mess/drivers/pyl601.c
View File

@ -84,6 +84,7 @@ public:
virtual void machine_reset();
virtual void video_start();
INTERRUPT_GEN_MEMBER(pyl601_interrupt);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
@ -503,11 +504,9 @@ INTERRUPT_GEN_MEMBER(pyl601_state::pyl601_interrupt)
device.execute().set_input_line(0, HOLD_LINE);
}
static const floppy_format_type pyl601_floppy_formats[] = {
FLOPPY_PYLDIN_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( pyl601_state::floppy_formats )
FLOPPY_PYLDIN_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( pyl601_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -574,8 +573,8 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state )
/* Devices */
MCFG_MC6845_ADD("crtc", MC6845, XTAL_2MHz, pyl601_crtc6845_interface)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pyl601_floppies, "525hd", 0, pyl601_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pyl601_floppies, "525hd", 0, pyl601_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pyl601_floppies, "525hd", 0, pyl601_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pyl601_floppies, "525hd", 0, pyl601_state::floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

11
src/mess/drivers/qx10.c
View File

@ -317,13 +317,6 @@ WRITE8_MEMBER( qx10_state::cmos_sel_w )
FDD
*/
static const floppy_format_type qx10_floppy_formats[] = {
FLOPPY_D88_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFI_FORMAT,
NULL // TODO: TD0 format
};
static SLOT_INTERFACE_START( qx10_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -1051,8 +1044,8 @@ static MACHINE_CONFIG_START( qx10, qx10_state )
MCFG_UPD7220_ADD("upd7220", MAIN_CLK/4, hgdc_intf, upd7220_map)
MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", qx10_floppies, "525dd", 0, qx10_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", qx10_floppies, "525dd", 0, qx10_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", qx10_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", qx10_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

9
src/mess/drivers/sage2.c
View File

@ -477,11 +477,6 @@ static const i8251_interface usart1_intf =
// upd765_interface fdc_intf
//-------------------------------------------------
static const floppy_format_type sage2_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( sage2_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -596,8 +591,8 @@ static MACHINE_CONFIG_START( sage2, sage2_state )
MCFG_I8251_ADD(I8251_1_TAG, usart1_intf)
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sage2_floppies, "525dd", 0, sage2_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", sage2_floppies, "525dd", 0, sage2_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sage2_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", sage2_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_IEEE488_BUS_ADD(ieee488_intf)
// internal ram

12
src/mess/drivers/samcoupe.c
View File

@ -509,11 +509,9 @@ static const cassette_interface samcoupe_cassette_interface =
NULL
};
static const floppy_format_type samcoupe_floppy_formats[] = {
FLOPPY_MGT_FORMAT, FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( samcoupe_state::floppy_formats )
FLOPPY_MGT_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( samcoupe_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )
@ -547,8 +545,8 @@ static MACHINE_CONFIG_START( samcoupe, samcoupe_state )
MCFG_SOFTWARE_LIST_ADD("cass_list","samcoupe_cass")
MCFG_WD1772x_ADD("wd1772", SAMCOUPE_XTAL_X1/3)
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", 0, samcoupe_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", 0, samcoupe_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", 0, samcoupe_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", 0, samcoupe_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","samcoupe_flop")
/* sound hardware */

7
src/mess/drivers/sg1000.c
View File

@ -969,11 +969,6 @@ WRITE_LINE_MEMBER(sf7000_state::sf7000_fdc_index_callback)
floppy_interface sf7000_floppy_interface
-------------------------------------------------*/
static const floppy_format_type sf7000_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( sf7000_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
@ -1193,7 +1188,7 @@ static MACHINE_CONFIG_START( sf7000, sf7000_state )
MCFG_I8255_ADD(UPD9255_1_TAG, sf7000_ppi_intf)
MCFG_I8251_ADD(UPD8251_TAG, default_i8251_interface)
MCFG_UPD765A_ADD(UPD765_TAG, true, true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "525hd", 0, sf7000_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
// MCFG_PRINTER_ADD("sp400") /* serial printer */
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, sc3000_cassette_interface)

9
src/mess/drivers/specpls3.c
View File

@ -364,11 +364,6 @@ DRIVER_INIT_MEMBER(spectrum_state,plus2)
m_floppy = 0;
}
static const floppy_format_type specpls3_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( specpls3_floppies )
SLOT_INTERFACE( "3ssdd", FLOPPY_3_SSDD )
SLOT_INTERFACE_END
@ -401,8 +396,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", 0, specpls3_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", 0, specpls3_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
/***************************************************************************

11
src/mess/drivers/super6.c
View File

@ -447,13 +447,6 @@ static COM8116_INTERFACE( brg_intf )
// floppy_format_type floppy_formats
//-------------------------------------------------
const floppy_format_type super6_state::floppy_formats[] = {
FLOPPY_IMD_FORMAT,
FLOPPY_MFM_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( super6_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -559,8 +552,8 @@ static MACHINE_CONFIG_START( super6, super6_state )
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_24MHz/4, pio_intf)
MCFG_WD2793x_ADD(WD2793_TAG, 1000000)
MCFG_COM8116_ADD(BR1945_TAG, XTAL_5_0688MHz, brg_intf)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", NULL, super6_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, NULL, NULL, super6_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, NULL, NULL, floppy_image_device::default_floppy_formats)
MCFG_SERIAL_TERMINAL_ADD(TERMINAL_TAG, terminal_intf, 4800)
// internal ram

9
src/mess/drivers/tandy2k.c
View File

@ -608,11 +608,6 @@ void tandy2k_state::fdc_drq(bool state)
dma_request(0, state);
}
static const floppy_format_type tandy2k_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( tandy2k_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
@ -724,8 +719,8 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state )
MCFG_PIC8259_ADD(I8259A_0_TAG, pic0_intf)
MCFG_PIC8259_ADD(I8259A_1_TAG, pic1_intf)
MCFG_I8272A_ADD(I8272A_TAG, true)
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", 0, tandy2k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", 0, tandy2k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_TANDY2K_KEYBOARD_ADD(kb_intf)

10
src/mess/drivers/wangpc.c
View File

@ -1032,12 +1032,6 @@ static MC2661_INTERFACE( epci_intf )
// upd765_interface fdc_intf
//-------------------------------------------------
static const floppy_format_type wangpc_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( wangpc_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -1256,8 +1250,8 @@ static MACHINE_CONFIG_START( wangpc, wangpc_state )
MCFG_IM6402_ADD(IM6402_TAG, uart_intf)
MCFG_MC2661_ADD(SCN2661_TAG, 0, epci_intf)
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", 0, wangpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", 0, wangpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf)
MCFG_WANGPC_KEYBOARD_ADD()

16
src/mess/drivers/x68k.c
View File

@ -2627,11 +2627,9 @@ DRIVER_INIT_MEMBER(x68k_state,x68030)
m_is_32bit = true;
}
static const floppy_format_type x68k_floppy_formats[] = {
FLOPPY_XDF_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( x68k_state::floppy_formats )
FLOPPY_XDF_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( x68k_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -2687,10 +2685,10 @@ static MACHINE_CONFIG_FRAGMENT( x68000_base )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_UPD72065_ADD("upd72065", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", 0, x68k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", 0, x68k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", 0, x68k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:3", x68k_floppies, "525hd", 0, x68k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", 0, x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", 0, x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", 0, x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:3", x68k_floppies, "525hd", 0, x68k_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","x68k_flop")

2
src/mess/includes/apollo.h
View File

@ -23,6 +23,7 @@
#include "machine/sc499.h"
#include "machine/3c505.h"
#include "machine/68681.h"
#include "machine/pc_fdc.h"
#ifndef VERBOSE
#define VERBOSE 0
@ -185,6 +186,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
MACHINE_CONFIG_EXTERN( apollo );

2
src/mess/includes/atarist.h
View File

@ -273,7 +273,7 @@ public:
floppy_image_device *floppy_devices[2];
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
TIMER_CALLBACK_MEMBER(st_mouse_tick);
TIMER_CALLBACK_MEMBER(atarist_shifter_tick);
TIMER_CALLBACK_MEMBER(atarist_glue_tick);

3
src/mess/includes/bebox.h
View File

@ -9,9 +9,11 @@
#ifndef BEBOX_H_
#define BEBOX_H_
#include "emu.h"
#include "machine/ins8250.h"
#include "machine/8237dma.h"
#include "machine/53c810.h"
#include "machine/upd765.h"
struct bebox_devices_t
{
@ -86,6 +88,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};

2
src/mess/includes/bw12.h
View File

@ -109,6 +109,8 @@ public:
int m_motor1;
TIMER_DEVICE_CALLBACK_MEMBER(floppy_motor_off_tick);
DECLARE_WRITE_LINE_MEMBER(pit_out0_w);
DECLARE_FLOPPY_FORMATS( bw12_floppy_formats );
DECLARE_FLOPPY_FORMATS( bw14_floppy_formats );
};
#endif

5
src/mess/includes/bw2.h
View File

@ -6,9 +6,6 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
#include "formats/hxcmfm_dsk.h"
#include "formats/imd_dsk.h"
#include "formats/mfi_dsk.h"
#include "machine/bw2exp.h"
#include "machine/ctronics.h"
#include "machine/i8251.h"
@ -74,7 +71,7 @@ public:
void fdc_intrq_w(bool state);
void fdc_drq_w(bool state);
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
// keyboard state
UINT8 m_kb;

2
src/mess/includes/einstein.h
View File

@ -67,7 +67,7 @@ public:
UINT8 *m_crtc_ram;
UINT8 m_de;
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_WRITE8_MEMBER(einstein_80col_ram_w);
DECLARE_READ8_MEMBER(einstein_80col_ram_r);
DECLARE_READ8_MEMBER(einstein_80col_state_r);

1
src/mess/includes/m5.h
View File

@ -73,6 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(sordm5_video_interrupt_callback);
void fdc_irq(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
#endif

1
src/mess/includes/mikromik.h
View File

@ -118,6 +118,7 @@ public:
int m_tc;
UINT32 screen_update_mm1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(kbclk_tick);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};

6
src/mess/includes/newbrain.h
View File

@ -8,16 +8,14 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/cop400/cop400.h"
#include "machine/upd765.h"
#include "imagedev/cassette.h"
#include "machine/6850acia.h"
#include "machine/adc0808.h"
#include "machine/z80ctc.h"
#include "machine/z80sio.h"
#include "imagedev/flopdrv.h"
#include "formats/basicdsk.h"
#include "imagedev/cassette.h"
#include "machine/rescap.h"
#include "machine/ram.h"
#include "machine/upd765.h"
#define SCREEN_TAG "screen"
#define Z80_TAG "409"

2
src/mess/includes/next.h
View File

@ -114,7 +114,7 @@ public:
void mo_irq(bool state);
void mo_drq(bool state);
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
static const cdrom_interface cdrom_intf;
static const harddisk_interface harddisk_intf;

2
src/mess/includes/pc.h
View File

@ -13,6 +13,7 @@
#include "machine/serial.h"
#include "machine/ser_mouse.h"
#include "machine/pc_kbdc.h"
#include "machine/upd765.h"
class pc_state : public driver_device
{
@ -129,6 +130,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
/*----------- defined in machine/pc.c -----------*/

1
src/mess/includes/pc1512.h
View File

@ -155,6 +155,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( mouse_button_2_changed );
DECLARE_INPUT_CHANGED_MEMBER( mouse_x_changed );
DECLARE_INPUT_CHANGED_MEMBER( mouse_y_changed );
DECLARE_FLOPPY_FORMATS( floppy_formats );
// system status register
int m_pit1;

2
src/mess/includes/pcw16.h
View File

@ -7,6 +7,7 @@
#ifndef PCW16_H_
#define PCW16_H_
#include "machine/upd765.h" /* FDC superio */
#define PCW16_BORDER_HEIGHT 8
#define PCW16_BORDER_WIDTH 8
@ -113,6 +114,7 @@ public:
void trigger_fdc_int();
void fdc_interrupt(bool state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
};
#endif /* PCW16_H_ */

4
src/mess/includes/samcoupe.h
View File

@ -11,6 +11,8 @@
#ifndef SAMCOUPE_H_
#define SAMCOUPE_H_
#include "machine/wd1772.h"
/* screen dimensions */
#define SAM_BLOCK 8
@ -114,7 +116,7 @@ public:
UINT8* sam_bank_read_ptr[4];
UINT8* sam_bank_write_ptr[4];
DECLARE_FLOPPY_FORMATS( floppy_formats );
};

1
src/mess/includes/super6.h
View File

@ -71,7 +71,6 @@ public:
DECLARE_WRITE_LINE_MEMBER( fr_w );
void fdc_intrq_w(bool state);
void fdc_drq_w(bool state);
static const floppy_format_type floppy_formats[];
void bankswitch();

1
src/mess/includes/x68k.h
View File

@ -74,6 +74,7 @@ public:
void floppy_load_unload();
int floppy_load(floppy_image_device *dev);
void floppy_unload(floppy_image_device *dev);
DECLARE_FLOPPY_FORMATS( floppy_formats );
struct
{

7
src/mess/machine/adam_fdc.c
View File

@ -105,10 +105,9 @@ void adam_fdc_device::fdc_intrq_w(bool state)
m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
}
const floppy_format_type adam_fdc_device::floppy_formats[] = {
FLOPPY_ADAM_FORMAT, FLOPPY_MFM_FORMAT, FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( adam_fdc_device::floppy_formats )
FLOPPY_ADAM_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( adam_fdc_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )

2
src/mess/machine/adam_fdc.h
View File

@ -49,7 +49,7 @@ public:
void fdc_intrq_w(bool state);
static const floppy_format_type floppy_formats[];
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
// device-level overrides

11
src/mess/machine/apollo.c
View File

@ -37,7 +37,6 @@
#include "machine/pic8259.h"
#include "machine/pc_fdc.h"
#include "formats/mfi_dsk.h"
#include "formats/apollo_dsk.h"
#include "cpu/m68000/m68000.h"
@ -1279,11 +1278,9 @@ static DEVICE_RESET(apollo_sio2)
#undef VERBOSE
#define VERBOSE 0
static const floppy_format_type apollo_floppy_formats[] = {
FLOPPY_APOLLO_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( apollo_state::floppy_formats )
FLOPPY_APOLLO_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( apollo_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -1399,7 +1396,7 @@ MACHINE_CONFIG_FRAGMENT( apollo )
MCFG_DUART68681_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz, apollo_sio2_config )
MCFG_PC_FDC_XT_ADD(APOLLO_FDC_TAG)
MCFG_FLOPPY_DRIVE_ADD(APOLLO_FDC_TAG ":0", apollo_floppies, "525hd", 0, apollo_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(APOLLO_FDC_TAG ":0", apollo_floppies, "525hd", 0, apollo_state::floppy_formats)
MCFG_OMTI8621_ADD(APOLLO_WDC_TAG, apollo_wdc_config)
MCFG_SC499_ADD(APOLLO_CTAPE_TAG, apollo_ctape_config)

8
src/mess/machine/fd2000.c
View File

@ -85,12 +85,6 @@ static const via6522_interface via_intf =
DEVCB_NULL
};
static const floppy_format_type fd2000_floppy_formats[] = {
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( fd2000_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -107,7 +101,7 @@ static MACHINE_CONFIG_FRAGMENT( fd2000 )
MCFG_VIA6522_ADD(M6522_TAG, 2000000, via_intf)
MCFG_UPD765A_ADD(DP8473_TAG, true, true)
MCFG_FLOPPY_DRIVE_ADD(DP8473_TAG ":0", fd2000_floppies, "525dd", 0, fd2000_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(DP8473_TAG ":0", fd2000_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END

13
src/mess/machine/iq151_disc2.c
View File

@ -6,7 +6,6 @@
#include "emu.h"
#include "iq151_disc2.h"
#include "formats/mfi_dsk.h"
#include "formats/iq151_dsk.h"
@ -14,11 +13,9 @@
IMPLEMENTATION
***************************************************************************/
static const floppy_format_type iq151_disc2_floppy_formats[] = {
FLOPPY_IQ151_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( iq151_disc2_device::floppy_formats )
FLOPPY_IQ151_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( iq151_disc2_floppies )
SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD )
@ -26,8 +23,8 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( iq151_disc2 )
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_device::floppy_formats)
MACHINE_CONFIG_END
ROM_START( iq151_disc2 )

2
src/mess/machine/iq151_disc2.h
View File

@ -24,6 +24,8 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
// device-level overrides

28
src/mess/machine/isa_fdc.c
View File

@ -14,11 +14,9 @@
#include "formats/mfi_dsk.h"
static const floppy_format_type pc_floppy_formats[] = {
FLOPPY_PC_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( isa8_fdc_device::floppy_formats )
FLOPPY_PC_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( pc_dd_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
@ -32,32 +30,32 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( cfg_xt )
MCFG_PC_FDC_XT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_dd_floppies, "525dd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_dd_floppies, "525dd", 0, isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", 0, isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( cfg_at )
MCFG_PC_FDC_AT_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( cfg_smc )
MCFG_SMC37C78_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( cfg_ps2 )
MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( cfg_superio )
MCFG_PC_FDC_SUPERIO_ADD("fdc")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, pc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END

2
src/mess/machine/isa_fdc.h
View File

@ -28,6 +28,8 @@ public:
required_device<pc_fdc_interface> fdc;
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
// device-level overrides
virtual void device_start();

16
src/mess/machine/kc_d004.c
View File

@ -47,11 +47,9 @@ static ADDRESS_MAP_START(kc_d004_gide_io, AS_IO, 8, kc_d004_gide_device)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(gide_r, gide_w)
ADDRESS_MAP_END
static const floppy_format_type kc_d004_floppy_formats[] = {
FLOPPY_KC85_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
FLOPPY_FORMATS_MEMBER( kc_d004_device::floppy_formats )
FLOPPY_KC85_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( kc_d004_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
@ -80,10 +78,10 @@ static MACHINE_CONFIG_FRAGMENT(kc_d004)
MCFG_Z80CTC_ADD( Z80CTC_TAG, XTAL_8MHz/2, kc_d004_ctc_intf )
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", kc_d004_floppies, "525hd", 0, kc_d004_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", kc_d004_floppies, "525hd", 0, kc_d004_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", kc_d004_floppies, "525hd", 0, kc_d004_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", kc_d004_floppies, "525hd", 0, kc_d004_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT(kc_d004_gide)

2
src/mess/machine/kc_d004.h
View File

@ -33,6 +33,8 @@ public:
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
// device-level overrides
virtual void device_start();

10
src/mess/machine/pf10.c
View File

@ -58,14 +58,6 @@ const rom_entry *epson_pf10_device::device_rom_region() const
// machine configurations
//-------------------------------------------------
static const floppy_format_type pf10_floppy_formats[] =
{
FLOPPY_D88_FORMAT,
FLOPPY_MFM_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( pf10_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )
SLOT_INTERFACE_END
@ -76,7 +68,7 @@ static MACHINE_CONFIG_FRAGMENT( pf10 )
MCFG_CPU_IO_MAP(cpu_io)
MCFG_UPD765A_ADD("upd765a", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", pf10_floppies, "35dd", 0, pf10_floppy_formats) // SMD-165
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", pf10_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) // SMD-165
MCFG_EPSON_SIO_ADD("sio")
MACHINE_CONFIG_END

12
src/mess/machine/tf20.c
View File

@ -116,14 +116,6 @@ static UPD7201_INTERFACE( tf20_upd7201_intf )
}
};
static const floppy_format_type tf20_floppy_formats[] =
{
FLOPPY_D88_FORMAT,
FLOPPY_MFM_FORMAT,
FLOPPY_MFI_FORMAT,
NULL
};
static SLOT_INTERFACE_START( tf20_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
@ -144,8 +136,8 @@ static MACHINE_CONFIG_FRAGMENT( tf20 )
MCFG_UPD765A_ADD("5a", true, true)
// floppy drives
MCFG_FLOPPY_DRIVE_ADD("5a:0", tf20_floppies, "525dd", 0, tf20_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("5a:1", tf20_floppies, "525dd", 0, tf20_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("5a:0", tf20_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("5a:1", tf20_floppies, "525dd", 0, floppy_image_device::default_floppy_formats)
// serial interface to another device
MCFG_EPSON_SIO_ADD("sio")