diff options
author | 2012-10-12 12:15:34 +0000 | |
---|---|---|
committer | 2012-10-12 12:15:34 +0000 | |
commit | 655b50ad161597da58d7ccee6943ac45d2b4d591 (patch) | |
tree | 4ff39ea4f893882bcc628b6ca3f609b9de7a548a /src | |
parent | 0d345c7f00a8d12e65c46b79b1037cb80e0dfa1c (diff) |
Unified floppy tags on other drivers as well (no whatsnew)
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/machine/amigafdc.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/ami1200.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/amiga.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/atarist.c | 18 | ||||
-rw-r--r-- | src/mess/drivers/einstein.c | 10 | ||||
-rw-r--r-- | src/mess/drivers/esq5505.c | 6 | ||||
-rw-r--r-- | src/mess/drivers/ht68k.c | 10 | ||||
-rw-r--r-- | src/mess/drivers/mirage.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/samcoupe.c | 8 |
9 files changed, 37 insertions, 37 deletions
diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c index 84451aff234..03f2085e1db 100644 --- a/src/emu/machine/amigafdc.c +++ b/src/emu/machine/amigafdc.c @@ -63,7 +63,7 @@ amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *o void amiga_fdc::device_start() { - static const char *names[] = { "fd0", "fd1", "fd2", "fd3" }; + static const char *names[] = { "fdc:0", "fdc:1", "fdc:2", "fdc:3" }; for(int i=0; i != 4; i++) { floppy_connector *con = machine().device<floppy_connector>(names[i]); if(con) diff --git a/src/mess/drivers/ami1200.c b/src/mess/drivers/ami1200.c index 55d21c83977..8415f69b0e3 100644 --- a/src/mess/drivers/ami1200.c +++ b/src/mess/drivers/ami1200.c @@ -322,10 +322,10 @@ static MACHINE_CONFIG_START( a1200n, ami1200_state ) /* fdc */ MCFG_AMIGA_FDC_ADD("fdc", AMIGA_68EC020_NTSC_CLOCK/2) - MCFG_FLOPPY_DRIVE_ADD("fd0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_AMIGA_KEYBOARD_ADD("kbd") MACHINE_CONFIG_END diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 643d2eb1d1e..813ad81c211 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -420,10 +420,10 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) /* fdc */ MCFG_AMIGA_FDC_ADD("fdc", AMIGA_68000_NTSC_CLOCK) - MCFG_FLOPPY_DRIVE_ADD("fd0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_AMIGA_KEYBOARD_ADD("kbd") MACHINE_CONFIG_END diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index 2f1459b1954..6a9a1844549 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -2211,7 +2211,7 @@ void st_state::machine_start() // register for state saving state_save(); - static const char *names[] = { "fd0", "fd1" }; + static const char *names[] = { WD1772_TAG ":0", WD1772_TAG ":1" }; for(int i=0; i != 2; i++) { floppy_connector *con = machine().device<floppy_connector>(names[i]); if(con) @@ -2350,8 +2350,8 @@ static MACHINE_CONFIG_START( st, st_state ) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD("fd0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) @@ -2400,8 +2400,8 @@ static MACHINE_CONFIG_START( megast, megast_state ) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia_midi_intf) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD("fd0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) MCFG_RP5C15_ADD(RP5C15_TAG, XTAL_32_768kHz, rtc_intf) @@ -2458,8 +2458,8 @@ static MACHINE_CONFIG_START( ste, ste_state ) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia_midi_intf) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, atariste_mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD("fd0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) // cartridge @@ -2526,8 +2526,8 @@ static MACHINE_CONFIG_START( stbook, stbook_state ) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia_midi_intf) MCFG_MC68901_ADD(MC68901_TAG, U517/8, stbook_mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, U517/2) - MCFG_FLOPPY_DRIVE_ADD("fd0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) // cartridge diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index 29a098379b3..bfefd8f2d34 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -241,7 +241,7 @@ WRITE8_MEMBER(einstein_state::einstein_drsel_w) logerror("%s: einstein_drsel_w %02x\n", machine().describe_context(), data); /* bit 0 to 3 select the drive */ - static const char *names[] = { "fd0", "fd1", "fd2", "fd3" }; + static const char *names[] = { IC_I042 ":0", IC_I042 ":1", IC_I042 ":2", IC_I042 ":3" }; floppy_image_device *floppy = 0; for(int i=0; i<4; i++) { if(BIT(data, i)) { @@ -803,10 +803,10 @@ static MACHINE_CONFIG_START( einstein, einstein_state ) MCFG_WD1770x_ADD(IC_I042, XTAL_X002) - MCFG_FLOPPY_DRIVE_ADD("fd0", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":2", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":3", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) /* software lists */ MCFG_SOFTWARE_LIST_ADD("disk_list","einstein") diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index 0bb7b1c9a25..474d1574d88 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -495,7 +495,7 @@ static MACHINE_CONFIG_DERIVED(eps, vfx) MCFG_ESQ1x22_ADD("epsvfd") MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("fd0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) MCFG_HD63450_ADD( "mc68450", dmac_interface ) // MC68450 compatible MACHINE_CONFIG_END @@ -505,7 +505,7 @@ static MACHINE_CONFIG_DERIVED(vfxsd, vfx) MCFG_CPU_PROGRAM_MAP(vfxsd_map) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("fd0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) MACHINE_CONFIG_END static INPUT_PORTS_START( vfx ) @@ -606,7 +606,7 @@ DRIVER_INIT_MEMBER(esq5505_state,common) m_system_type = GENERIC; m_duart_io = 0; - floppy_connector *con = machine().device<floppy_connector>("fd0"); + floppy_connector *con = machine().device<floppy_connector>("wd1772:0"); floppy_image_device *floppy = con ? con->get_device() : 0; if (floppy) { diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index 6588b7f12f8..841a4617425 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -109,7 +109,7 @@ static void duart_output(device_t *device, UINT8 data) { ht68k_state *state = device->machine().driver_data<ht68k_state>(); - static const char *names[] = { "fd0", "fd1", "fd2", "fd3" }; + static const char *names[] = { "wd1770:0", "wd1770:1", "wd1770:2", "wd1770:3" }; floppy_image_device *floppy = 0; for(int i=0; i<4; i++) { if(BIT(data, 7-i)==0) { @@ -159,10 +159,10 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_WD1770x_ADD("wd1770", XTAL_8MHz ) - MCFG_FLOPPY_DRIVE_ADD("fd0", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) + 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) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index b937d57ee84..e71ba4e207c 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -272,7 +272,7 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_ACIA6850_ADD("acia6850", mirage_acia6850_interface) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("fd0", ensoniq_floppies, "35dd", 0, mirage_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, mirage_state::floppy_formats) MACHINE_CONFIG_END static INPUT_PORTS_START( mirage ) @@ -288,7 +288,7 @@ ROM_END DRIVER_INIT_MEMBER(mirage_state,mirage) { - floppy_connector *con = machine().device<floppy_connector>("fd0"); + floppy_connector *con = machine().device<floppy_connector>("wd1772:0"); floppy_image_device *floppy = con ? con->get_device() : 0; if (floppy) { diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 2ea693d7a4c..3d7d48a50a0 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -65,7 +65,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_disk_r) wd1772_t *fdc = machine().device<wd1772_t>("wd1772"); /* drive and side is encoded into bit 5 and 3 */ - floppy_connector *con = machine().device<floppy_connector>(BIT(offset, 4) ? "fd1" : "fd0"); + floppy_connector *con = machine().device<floppy_connector>(BIT(offset, 4) ? "wd1772:1" : "wd1772:0"); floppy_image_device *floppy = con ? con->get_device() : 0; if(floppy) @@ -89,7 +89,7 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_disk_w) wd1772_t *fdc = machine().device<wd1772_t>("wd1772"); /* drive and side is encoded into bit 5 and 3 */ - floppy_connector *con = machine().device<floppy_connector>(BIT(offset, 4) ? "fd1" : "fd0"); + floppy_connector *con = machine().device<floppy_connector>(BIT(offset, 4) ? "wd1772:1" : "wd1772:0"); floppy_image_device *floppy = con ? con->get_device() : 0; if(floppy) @@ -547,8 +547,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("fd0", samcoupe_floppies, "35dd", 0, samcoupe_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", samcoupe_floppies, "35dd", 0, samcoupe_floppy_formats) + 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_SOFTWARE_LIST_ADD("flop_list","samcoupe_flop") /* sound hardware */ |