diff options
author | Curt Coder <curtcoder@mail.com> | 2014-05-12 13:01:39 +0000 |
---|---|---|
committer | Curt Coder <curtcoder@mail.com> | 2014-05-12 13:01:39 +0000 |
commit | b684b860793b4d17a03c74309645707a1c88eaf9 (patch) | |
tree | db06dbb53a735b2ef4be57b0d84d9a21d8e966f2 | |
parent | fa528bc91c2c479093a29de4a801381dcec26cf9 (diff) |
wd17xx: Cleanup. (nw)
51 files changed, 50 insertions, 258 deletions
diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/emu/bus/bml3/bml3mp1802.c index 1254e03eb46..a404fe40b1f 100644 --- a/src/emu/bus/bml3/bml3mp1802.c +++ b/src/emu/bus/bml3/bml3mp1802.c @@ -35,12 +35,6 @@ WRITE_LINE_MEMBER( bml3bus_mp1802_device::bml3_wd17xx_intrq_w ) } } -const wd17xx_interface bml3_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1} -}; - - #define MP1802_ROM_REGION "mp1802_rom" ROM_START( mp1802 ) @@ -50,7 +44,7 @@ ROM_START( mp1802 ) ROM_END MACHINE_CONFIG_FRAGMENT( mp1802 ) - MCFG_MB8866_ADD("wd17xx", bml3_wd17xx_interface ) + MCFG_MB8866_ADD("wd17xx", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bml3_mp1802_floppy_interface) MACHINE_CONFIG_END diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c index 66259167723..679b59d30af 100644 --- a/src/emu/bus/coco/coco_fdc.c +++ b/src/emu/bus/coco/coco_fdc.c @@ -146,13 +146,8 @@ WRITE_LINE_MEMBER( coco_fdc_device::fdc_drq_w ) // COCO FDC //************************************************************************** -static const wd17xx_interface coco_wd17xx_interface = -{ - {FLOPPY_0,FLOPPY_1,FLOPPY_2,FLOPPY_3} -}; - static MACHINE_CONFIG_FRAGMENT(coco_fdc) - MCFG_WD1773_ADD(WD_TAG, coco_wd17xx_interface) + MCFG_WD1773_ADD(WD_TAG, default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_drq_w)) MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, XTAL_32_768kHz) @@ -414,7 +409,7 @@ WRITE8_MEMBER(coco_fdc_device::write) //************************************************************************** static MACHINE_CONFIG_FRAGMENT(dragon_fdc) - MCFG_WD2797_ADD(WD2797_TAG, coco_wd17xx_interface) + MCFG_WD2797_ADD(WD2797_TAG, default_wd17xx_interface_2_drives) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(coco_floppy_interface) MACHINE_CONFIG_END diff --git a/src/emu/bus/ti99_peb/bwg.c b/src/emu/bus/ti99_peb/bwg.c index 1d46b3e2668..5882b0bbf89 100644 --- a/src/emu/bus/ti99_peb/bwg.c +++ b/src/emu/bus/ti99_peb/bwg.c @@ -1104,11 +1104,6 @@ void snug_bwg_legacy_device::device_reset() m_ram_page = 0; } -const wd17xx_interface bwgleg_wd17xx_interface = -{ - { PFLOPPY_0, PFLOPPY_1, PFLOPPY_2, PFLOPPY_3 } -}; - INPUT_PORTS_START( bwg_fdc_legacy ) PORT_START( "BWGDIP1" ) PORT_DIPNAME( 0x01, 0x00, "BwG step rate" ) @@ -1129,7 +1124,7 @@ INPUT_PORTS_START( bwg_fdc_legacy ) INPUT_PORTS_END MACHINE_CONFIG_FRAGMENT( bwg_fdc_legacy ) - MCFG_WD1773_ADD(FDCLEG_TAG, bwgleg_wd17xx_interface ) + MCFG_WD1773_ADD(FDCLEG_TAG, default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(snug_bwg_legacy_device, intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(snug_bwg_legacy_device, drq_w)) diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index af2fd832e16..ac7e2501561 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -296,6 +296,11 @@ const wd17xx_interface default_wd17xx_interface_2_drives = { FLOPPY_0, FLOPPY_1, NULL, NULL} }; +const wd17xx_interface default_wd17xx_interface_1_drive = +{ + { FLOPPY_0, NULL, NULL, NULL} +}; + /*************************************************************************** diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h index 80271a90919..e55014fbfe3 100644 --- a/src/emu/machine/wd17xx.h +++ b/src/emu/machine/wd17xx.h @@ -34,6 +34,7 @@ struct wd17xx_interface extern const wd17xx_interface default_wd17xx_interface; extern const wd17xx_interface default_wd17xx_interface_2_drives; +extern const wd17xx_interface default_wd17xx_interface_1_drive; /*************************************************************************** MACROS diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index f80aa35de53..16cd0c47c7c 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -762,7 +762,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MCFG_DEVICE_ADD("i8271", I8271, 0) MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_state, bbc_i8271_interrupt)) MCFG_I8271_FLOPPIES(FLOPPY_0, FLOPPY_1) - MCFG_WD1770_ADD("wd177x", bbc_wd17xx_interface ) + MCFG_WD1770_ADD("wd177x", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bbc_floppy_interface) @@ -824,7 +824,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbca ) MCFG_DEVICE_ADD("i8271", I8271, 0) MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_state, bbc_i8271_interrupt)) MCFG_I8271_FLOPPIES(FLOPPY_0, FLOPPY_1) - MCFG_WD1770_ADD("wd177x", bbc_wd17xx_interface ) + MCFG_WD1770_ADD("wd177x", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bbc_floppy_interface) @@ -988,7 +988,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(bbc_state, bbcb_via_user_irq_w)) /* fdc */ - MCFG_WD1770_ADD("wd177x", bbc_wd17xx_interface ) + MCFG_WD1770_ADD("wd177x", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bbc_floppy_interface) @@ -1076,7 +1076,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) /* fdc */ MCFG_DEVICE_REMOVE("wd177x") - MCFG_WD1772_ADD("wd177x", bbc_wd17xx_interface ) + MCFG_WD1772_ADD("wd177x", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c index d01e623ed4c..76b6d329d24 100644 --- a/src/mess/drivers/cgenie.c +++ b/src/mess/drivers/cgenie.c @@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( cgenie_common, cgenie_state ) MCFG_CASSETTE_FORMATS(cgenie_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED) - MCFG_FD1793_ADD("wd179x", cgenie_wd17xx_interface ) // TODO confirm type + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface) // TODO confirm type MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(cgenie_state,cgenie_fdc_intrq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(cgenie_floppy_interface) diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c index 8c9b27b57df..4e94565cb96 100644 --- a/src/mess/drivers/dgn_beta.c +++ b/src/mess/drivers/dgn_beta.c @@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state ) MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_a)) MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_b)) - MCFG_WD2797_ADD(FDC_TAG, dgnbeta_wd17xx_interface ) + MCFG_WD2797_ADD(FDC_TAG, default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(dgn_beta_state,dgnbeta_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(dgn_beta_state,dgnbeta_fdc_drq_w)) diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c index 81c33bc1270..e1b922dc1ea 100644 --- a/src/mess/drivers/dragon.c +++ b/src/mess/drivers/dragon.c @@ -221,7 +221,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( dgnalpha, dragon_base, dragon_alpha_state ) // floppy MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(coco_floppy_interface) - MCFG_WD2797_ADD(WD2797_TAG, dragon_alpha_state::fdc_interface) + MCFG_WD2797_ADD(WD2797_TAG, default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_drq_w)) diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index 670aa480ccd..aa5dcd6d2ad 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -1963,11 +1963,6 @@ void fm7_state::machine_reset() memset(m_video_ram, 0, sizeof(UINT8) * 0x18000); } -static const wd17xx_interface fm7_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - static const floppy_interface fm7_floppy_interface = { FLOPPY_STANDARD_5_25_DSHD, @@ -2014,7 +2009,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(fm7_state,fm7_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(fm7_state,fm7_fdc_drq_w)) @@ -2070,7 +2065,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) @@ -2126,7 +2121,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) @@ -2184,7 +2179,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) @@ -2235,7 +2230,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index b282204eb1e..21efbd24b20 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -389,11 +389,6 @@ DISCRETE_SOUND_END /********* mini disque interface ***************************/ /***********************************************************/ -const wd17xx_interface hector_wd17xx_interface = -{ - {FLOPPY_0, NULL, NULL, NULL} // Only one floppy on the minidisc -}; - const floppy_interface minidisc_floppy_interface = { FLOPPY_STANDARD_3_5_DSDD, @@ -620,7 +615,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state ) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx) /* Mini Disc */ - MCFG_FD1793_ADD("wd179x", hector_wd17xx_interface ) + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface_1_drive) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, minidisc_floppy_interface) /* video hardware */ diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c index e3eebe521bd..b17f40e3375 100644 --- a/src/mess/drivers/jupiter.c +++ b/src/mess/drivers/jupiter.c @@ -178,10 +178,6 @@ UINT32 jupiter3_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // DEVICE CONFIGURATION //************************************************************************** -//------------------------------------------------- -// wd17xx_interface fdc_intf -//------------------------------------------------- - #if 0 static const floppy_interface jupiter_floppy_interface = { @@ -191,11 +187,6 @@ static const floppy_interface jupiter_floppy_interface = }; #endif -static const wd17xx_interface fdc_intf = -{ - { FLOPPY_0, FLOPPY_1, NULL, NULL } -}; - //************************************************************************** // MACHINE INITIALIZATION //************************************************************************** @@ -237,7 +228,7 @@ static MACHINE_CONFIG_START( jupiter, jupiter2_state ) MCFG_CPU_IO_MAP(jupiter_m6800_io) // devices - MCFG_FD1771_ADD(INS1771N1_TAG, fdc_intf) + MCFG_FD1771_ADD(INS1771N1_TAG, default_wd17xx_interface_2_drives) MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) // internal ram @@ -269,7 +260,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state ) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") // devices - MCFG_FD1771_ADD(INS1771N1_TAG, fdc_intf) + MCFG_FD1771_ADD(INS1771N1_TAG, default_wd17xx_interface_2_drives) MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(jupiter3_state, kbd_put)) diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index cda235bfecf..9945db7d6e2 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -175,10 +175,6 @@ WRITE8_MEMBER( mbc200_state::porta_w ) m_hs_bit &= ~0x80; } -static const wd17xx_interface mbc200_mb8876_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; static const floppy_interface mbc200_floppy_interface = { FLOPPY_STANDARD_5_25_SSDD_40, @@ -235,7 +231,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state ) MCFG_DEVICE_ADD("i8251_1", I8251, 0) // INS8251N MCFG_DEVICE_ADD("i8251_2", I8251, 0) // INS8251A - MCFG_MB8876_ADD("fdc",mbc200_mb8876_interface) // MB8876A + MCFG_MB8876_ADD("fdc",default_wd17xx_interface_2_drives) // MB8876A MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(mbc200_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mess/drivers/mbc55x.c b/src/mess/drivers/mbc55x.c index b97a4b1dad8..42591a653d7 100644 --- a/src/mess/drivers/mbc55x.c +++ b/src/mess/drivers/mbc55x.c @@ -279,7 +279,7 @@ static MACHINE_CONFIG_START( mbc55x, mbc55x_state ) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(mbc55x_state, vid_vsync_changed)) /* Backing storage */ - MCFG_FD1793_ADD(FDC_TAG, mbc55x_wd17xx_interface ) + MCFG_FD1793_ADD(FDC_TAG, default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(mbc55x_state, mbc55x_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(mbc55x_state, mbc55x_fdc_drq_w)) MCFG_WD17XX_DDEN_CALLBACK(GND) diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c index b45e0c92073..f45f2782466 100644 --- a/src/mess/drivers/ms0515.c +++ b/src/mess/drivers/ms0515.c @@ -133,13 +133,6 @@ void ms0515_state::machine_reset() static INPUT_PORTS_START( ms0515 ) INPUT_PORTS_END - -static const wd17xx_interface ms0515_wd17xx_interface = -{ - { FLOPPY_0, NULL, NULL, NULL } -}; - - static LEGACY_FLOPPY_OPTIONS_START(ms0515) LEGACY_FLOPPY_OPTION(ms0515, "dsk", "MS0515 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, HEADS([1]) @@ -235,7 +228,7 @@ static MACHINE_CONFIG_START( ms0515, ms0515_state ) MCFG_T11_INITIAL_MODE(0xf2ff) MCFG_CPU_PROGRAM_MAP(ms0515_mem) - MCFG_FD1793_ADD( "vg93", ms0515_wd17xx_interface ) + MCFG_FD1793_ADD( "vg93", default_wd17xx_interface_1_drive) MCFG_WD17XX_DDEN_CALLBACK(VCC) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, ms0515_floppy_interface) diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index 1106b7ab312..beaf1348057 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -233,12 +233,6 @@ static GFXDECODE_START( myb3k ) GFXDECODE_ENTRY( "ipl", 0x0000, myb3k_charlayout, 0, 1 ) GFXDECODE_END -static const wd17xx_interface myb3k_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - - static const floppy_interface myb3k_floppy_interface = { FLOPPY_STANDARD_5_25_DSDD_40, //todo @@ -270,7 +264,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state ) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_MB8877_ADD("fdc", myb3k_wd17xx_interface ) //unknown type + MCFG_MB8877_ADD("fdc", default_wd17xx_interface_2_drives) //unknown type MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(myb3k_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index e0334368609..8ff56eea9ca 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -776,11 +776,6 @@ READ8_MEMBER(mz2000_state::mz2000_pio1_porta_r) return m_porta_latch; } -static const wd17xx_interface mz2000_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - #if 0 static LEGACY_FLOPPY_OPTIONS_START( mz2000 ) LEGACY_FLOPPY_OPTION( img2d, "2d", "2D disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, @@ -824,7 +819,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state ) MCFG_PIT8253_CLK1(31250) /* needed by "Art Magic" to boot */ MCFG_PIT8253_CLK2(31250) - MCFG_MB8877_ADD("mb8877a",mz2000_mb8877a_interface) + MCFG_MB8877_ADD("mb8877a",default_wd17xx_interface) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(mz2000_floppy_interface) MCFG_SOFTWARE_LIST_ADD("flop_list","mz2000_flop") diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index 249f9120328..4b4cef91e2f 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -1199,11 +1199,6 @@ WRITE8_MEMBER(mz2500_state::mz2500_fdc_w) } } -static const wd17xx_interface mz2500_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - #if 0 static LEGACY_FLOPPY_OPTIONS_START( mz2500 ) LEGACY_FLOPPY_OPTION( img2d, "2d", "2D disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, @@ -2081,7 +2076,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state ) MCFG_PIT8253_CLK2(16) //CH2, trusted, used by Super MZ demo / The Black Onyx and a bunch of others (TODO: timing of this) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk1)) - MCFG_MB8877_ADD("mb8877a",mz2500_mb8877a_interface) + MCFG_MB8877_ADD("mb8877a",default_wd17xx_interface) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(mz2500_floppy_interface) MCFG_SOFTWARE_LIST_ADD("flop_list","mz2500") diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c index 70672267c92..2a6809ff753 100644 --- a/src/mess/drivers/nascom1.c +++ b/src/mess/drivers/nascom1.c @@ -329,7 +329,7 @@ static MACHINE_CONFIG_DERIVED( nascom2, nascom1 ) MCFG_GFXDECODE_MODIFY("gfxdecode", nascom2) - MCFG_FD1793_ADD("wd1793", nascom2_wd17xx_interface ) + MCFG_FD1793_ADD("wd1793", default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(nascom1_state,nascom2_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(nascom1_state,nascom2_fdc_drq_w)) MCFG_WD17XX_DDEN_CALLBACK(VCC) diff --git a/src/mess/drivers/pk8020.c b/src/mess/drivers/pk8020.c index 2452b72fe55..0210788e2bd 100644 --- a/src/mess/drivers/pk8020.c +++ b/src/mess/drivers/pk8020.c @@ -155,11 +155,6 @@ static const floppy_interface pk8020_floppy_interface = "floppy_5_25" }; -static const wd17xx_interface pk8020_wd17xx_interface = -{ - { FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 } -}; - /* F4 Character Displayer */ static const gfx_layout pk8020_charlayout = { @@ -224,7 +219,7 @@ static MACHINE_CONFIG_START( pk8020, pk8020_state ) MCFG_DEVICE_ADD("rs232", I8251, 0) MCFG_DEVICE_ADD("lan", I8251, 0) - MCFG_FD1793_ADD("wd1793", pk8020_wd17xx_interface) + MCFG_FD1793_ADD("wd1793", default_wd17xx_interface) MCFG_WD17XX_DDEN_CALLBACK(VCC) /* audio hardware */ diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index 3a1869997a2..be5a52c85f9 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -1193,12 +1193,6 @@ static GFXDECODE_START( rainbow ) GFXDECODE_ENTRY( "chargen", 0x0000, rainbow_charlayout, 0, 1 ) GFXDECODE_END -// Rainbow Z80 polls only, no IRQ/DRQ are connected -const wd17xx_interface rainbow_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - static const floppy_interface floppy_intf = { FLOPPY_STANDARD_5_25_SSDD_80, @@ -1235,7 +1229,7 @@ static MACHINE_CONFIG_START( rainbow, rainbow_state ) MCFG_VT_VIDEO_RAM_CALLBACK(READ8(rainbow_state, read_video_ram_r)) MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(WRITELINE(rainbow_state, clear_video_interrupt)) - MCFG_FD1793_ADD("wd1793", rainbow_wd17xx_interface ) + MCFG_FD1793_ADD("wd1793", default_wd17xx_interface ) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(floppy_intf) MCFG_SOFTWARE_LIST_ADD("flop_list","rainbow") diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 6b2fe7abfcf..215e87db4b5 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -1021,11 +1021,6 @@ PALETTE_INIT_MEMBER(smc777_state, smc777) } } -static const wd17xx_interface smc777_mb8876_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - static LEGACY_FLOPPY_OPTIONS_START( smc777 ) LEGACY_FLOPPY_OPTION( img, "img", "SMC70 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, HEADS([1]) @@ -1076,7 +1071,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state ) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_MB8876_ADD("fdc",smc777_mb8876_interface) + MCFG_MB8876_ADD("fdc",default_wd17xx_interface_2_drives) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(smc777_state, smc777_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(smc777_state, smc777_fdc_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(smc777_floppy_interface) diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c index acb7d34a96b..e8e697872fa 100644 --- a/src/mess/drivers/svi318.c +++ b/src/mess/drivers/svi318.c @@ -323,7 +323,7 @@ static MACHINE_CONFIG_START( svi318, svi318_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) MCFG_CASSETTE_INTERFACE("svi318_cass") - MCFG_FD1793_ADD("wd179x", svi_wd17xx_interface ) + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface_2_drives ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_drq_w)) @@ -459,7 +459,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) MCFG_CASSETTE_INTERFACE("svi318_cass") - MCFG_FD1793_ADD("wd179x", svi_wd17xx_interface ) + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface_2_drives ) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(svi318_floppy_interface) diff --git a/src/mess/drivers/swtpc09.c b/src/mess/drivers/swtpc09.c index faae58d8139..468e8114118 100644 --- a/src/mess/drivers/swtpc09.c +++ b/src/mess/drivers/swtpc09.c @@ -169,7 +169,7 @@ static MACHINE_CONFIG_START( swtpc09, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_FD1793_ADD("fdc", default_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_drq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) @@ -208,7 +208,7 @@ static MACHINE_CONFIG_START( swtpc09i, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_FD1793_ADD("fdc", default_wd17xx_interface) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) MCFG_DEVICE_ADD("piaide", PIA6821, 0) @@ -256,7 +256,7 @@ static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793_ADD("fdc", swtpc09_wd17xx_interface ) + MCFG_FD1793_ADD("fdc", default_wd17xx_interface) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(swtpc09_floppy_interface) MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4) diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c index cfa49de0f4a..efe0eed2b5a 100644 --- a/src/mess/drivers/trs80.c +++ b/src/mess/drivers/trs80.c @@ -595,7 +595,7 @@ static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5) - MCFG_FD1793_ADD("wd179x", trs80_wd17xx_interface ) // should be FD1771 or FD1791 but inverted data lines are too tricky to fix now + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface) // should be FD1771 or FD1791 but inverted data lines are too tricky to fix now MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(trs80_state,trs80_fdc_intrq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(trs80_floppy_interface) diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index e8dd0e82758..5fbbe0e74bf 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -185,11 +185,6 @@ static const floppy_interface unixpc_floppy_interface = NULL }; -static const wd17xx_interface unixpc_wd17xx_intf = -{ - { FLOPPY_0, NULL, NULL, NULL } -}; - static MACHINE_CONFIG_START( unixpc, unixpc_state ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz) @@ -212,7 +207,7 @@ static MACHINE_CONFIG_START( unixpc, unixpc_state ) MCFG_RAM_EXTRA_OPTIONS("2M") // floppy - MCFG_WD2797_ADD("wd2797", unixpc_wd17xx_intf) + MCFG_WD2797_ADD("wd2797", default_wd17xx_interface_1_drive) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_drq_w)) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, unixpc_floppy_interface) diff --git a/src/mess/drivers/vector06.c b/src/mess/drivers/vector06.c index 430b9a9b9f9..054256b8f0e 100644 --- a/src/mess/drivers/vector06.c +++ b/src/mess/drivers/vector06.c @@ -135,11 +135,6 @@ static const floppy_interface vector_floppy_interface = NULL }; -const wd17xx_interface vector06_wd17xx_interface = -{ - { FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - /* Machine driver */ static MACHINE_CONFIG_START( vector06, vector06_state ) /* basic machine hardware */ @@ -181,7 +176,7 @@ static MACHINE_CONFIG_START( vector06, vector06_state ) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_FD1793_ADD("wd1793", vector06_wd17xx_interface) + MCFG_FD1793_ADD("wd1793", default_wd17xx_interface_2_drives) MCFG_WD17XX_DDEN_CALLBACK(VCC) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(vector_floppy_interface) diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index 87b9753fce2..4b0023b914a 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -1049,21 +1049,11 @@ WRITE8_MEMBER( x1_state::x1_fdc_w ) } } -static const wd17xx_interface x1_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - WRITE_LINE_MEMBER(x1_state::fdc_drq_w) { m_dma->rdy_w(state ^ 1); } -static const wd17xx_interface x1turbo_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - /************************************* * * Programmable Character Generator @@ -2485,7 +2475,7 @@ static MACHINE_CONFIG_START( x1, x1_state ) MCFG_VIDEO_START_OVERRIDE(x1_state,x1) - MCFG_MB8877_ADD("fdc",x1_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("rom") @@ -2538,7 +2528,7 @@ static MACHINE_CONFIG_DERIVED( x1turbo, x1 ) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(x1_state, io_write_byte)) MCFG_DEVICE_REMOVE("fdc") - MCFG_MB8877_ADD("fdc",x1turbo_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(x1_state,fdc_drq_w)) MCFG_YM2151_ADD("ym", MAIN_CLOCK/8) //option board diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index 44b0142d8c7..c0518173727 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -71,11 +71,6 @@ static ADDRESS_MAP_START( pce_io, AS_IO, 8, x1twin_state ) ADDRESS_MAP_END #endif -static const wd17xx_interface x1_mb8877a_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - /************************************* * * Inputs @@ -476,7 +471,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state ) MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1) - MCFG_MB8877_ADD("fdc",x1_mb8877a_interface) + MCFG_MB8877_ADD("fdc",default_wd17xx_interface) MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("rom") diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index e24c92af9ee..85ce1f7872c 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -642,11 +642,6 @@ WRITE_LINE_MEMBER( z100_state::video_pia_CB2_w ) m_clr_val = (state & 1) ? 0x00 : 0xff; } -static const wd17xx_interface z207_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - static LEGACY_FLOPPY_OPTIONS_START( z100 ) LEGACY_FLOPPY_OPTION( img2d, "2d", "2D disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, HEADS([2]) @@ -718,7 +713,7 @@ static MACHINE_CONFIG_START( z100, z100_state ) MCFG_DEVICE_ADD("pia1", PIA6821, 0) - MCFG_FD1797_ADD("z207_fdc",z207_interface) + MCFG_FD1797_ADD("z207_fdc",default_wd17xx_interface_2_drives) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(z100_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h index aa4bddbdd55..4cacfa4d434 100644 --- a/src/mess/includes/bbc.h +++ b/src/mess/includes/bbc.h @@ -418,9 +418,4 @@ public: // HACK FOR MC6845 required_device<palette_device> m_palette; }; - -/*----------- defined in machine/bbc.c -----------*/ - -extern const wd17xx_interface bbc_wd17xx_interface; - #endif /* BBC_H_ */ diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h index 15f572fa017..f95f676ed00 100644 --- a/src/mess/includes/cgenie.h +++ b/src/mess/includes/cgenie.h @@ -145,10 +145,4 @@ public: }; - -/*----------- defined in machine/cgenie.c -----------*/ - - -extern const wd17xx_interface cgenie_wd17xx_interface; - #endif /* CGENIE_H_ */ diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h index 2b4ec244a6d..5cf00d3cd38 100644 --- a/src/mess/includes/dgn_beta.h +++ b/src/mess/includes/dgn_beta.h @@ -215,9 +215,4 @@ public: required_device<palette_device> m_palette; }; - -/*----------- defined in machine/dgn_beta.c -----------*/ - -extern const wd17xx_interface dgnbeta_wd17xx_interface; - #endif /* DGN_BETA_H_ */ diff --git a/src/mess/includes/dgnalpha.h b/src/mess/includes/dgnalpha.h index 1fbab1e2d30..cbc6a63b509 100644 --- a/src/mess/includes/dgnalpha.h +++ b/src/mess/includes/dgnalpha.h @@ -61,8 +61,6 @@ public: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - static const wd17xx_interface fdc_interface; - protected: /* driver overrides */ virtual void device_start(void); diff --git a/src/mess/includes/hec2hrp.h b/src/mess/includes/hec2hrp.h index 9c2f790d70f..eada833c760 100644 --- a/src/mess/includes/hec2hrp.h +++ b/src/mess/includes/hec2hrp.h @@ -186,5 +186,4 @@ public: /* Sound function*/ extern const sn76477_interface hector_sn76477_interface; -extern const wd17xx_interface hector_wd17xx_interface; // Special for minidisc extern const floppy_interface minidisc_floppy_interface; diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h index 0f2beb080be..717d6a62d9d 100644 --- a/src/mess/includes/mbc55x.h +++ b/src/mess/includes/mbc55x.h @@ -198,8 +198,6 @@ extern const unsigned char mbc55x_palette[SCREEN_NO_COLOURS][3]; #define FDC_PAUSE 10000 -extern const wd17xx_interface mbc55x_wd17xx_interface; - /*----------- defined in video/mbc55x.c -----------*/ diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index 859079a1a34..cc2f91e238a 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -78,7 +78,4 @@ public: }; -/*----------- defined in machine/nascom1.c -----------*/ - -extern const wd17xx_interface nascom2_wd17xx_interface; #endif /* NASCOM1_H_ */ diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index 636bad3515b..52a85befe54 100644 --- a/src/mess/includes/svi318.h +++ b/src/mess/includes/svi318.h @@ -152,9 +152,4 @@ protected: void svi318_vdp_interrupt(int i); }; - -/*----------- defined in machine/svi318.c -----------*/ - -extern const wd17xx_interface svi_wd17xx_interface; - #endif /* SVI318_H_ */ diff --git a/src/mess/includes/swtpc09.h b/src/mess/includes/swtpc09.h index c6f66b63eaf..ce3d56c0a4c 100644 --- a/src/mess/includes/swtpc09.h +++ b/src/mess/includes/swtpc09.h @@ -137,8 +137,4 @@ public: }; -/*----------- defined in machine/swtpc09.c -----------*/ - -extern const wd17xx_interface swtpc09_wd17xx_interface; - #endif /* swtpc09_H_ */ diff --git a/src/mess/includes/trs80.h b/src/mess/includes/trs80.h index 05d5959b9f0..9dac7b89fa4 100644 --- a/src/mess/includes/trs80.h +++ b/src/mess/includes/trs80.h @@ -192,9 +192,4 @@ protected: void trs80_fdc_interrupt_internal(); }; - -/*----------- defined in machine/trs80.c -----------*/ - -extern const wd17xx_interface trs80_wd17xx_interface; - #endif /* TRS80_H_ */ diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index a295e049b2f..e12f031ad06 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1602,11 +1602,6 @@ WRITE_LINE_MEMBER(bbc_state::bbc_wd177x_drq_w) bbc_update_fdq_int(state); } -const wd17xx_interface bbc_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - WRITE8_MEMBER(bbc_state::bbc_wd177x_status_w) { wd1770_device *fdc = machine().device<wd1770_device>("wd177x"); diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index 396f215eb7d..95a206b4fd9 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -93,11 +93,6 @@ WRITE_LINE_MEMBER(beta_disk_device::wd179x_drq_w) m_betadisk_status &=~(1<<6); } -static const wd17xx_interface beta_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - READ8_MEMBER(beta_disk_device::status_r) { if (m_betadisk_active==1) { @@ -155,7 +150,7 @@ WRITE8_MEMBER(beta_disk_device::param_w) } // bit 3 connected to pin 23 "HRDY" of FDC // TEMP HACK, FDD motor and RDY FDC pin controlled by HLD pin of FDC - legacy_floppy_image_device *flop = subdevice<legacy_floppy_image_device>(beta_wd17xx_interface.floppy_drive_tags[data & 3]); + legacy_floppy_image_device *flop = subdevice<legacy_floppy_image_device>(default_wd17xx_interface.floppy_drive_tags[data & 3]); flop->floppy_mon_w(CLEAR_LINE); flop->floppy_drive_set_ready_state(1, 0); } @@ -197,7 +192,7 @@ static const floppy_interface beta_floppy_interface = }; static MACHINE_CONFIG_FRAGMENT( beta_disk ) - MCFG_WD2793_ADD("wd179x", beta_wd17xx_interface ) // KR1818VG93 clone of WD1793 + MCFG_WD2793_ADD("wd179x", default_wd17xx_interface ) // KR1818VG93 clone of WD1793 MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(beta_disk_device, wd179x_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(beta_disk_device, wd179x_drq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(beta_floppy_interface) diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c index 8a09ef79de9..f3977fb7ed7 100644 --- a/src/mess/machine/cgenie.c +++ b/src/mess/machine/cgenie.c @@ -430,11 +430,6 @@ WRITE_LINE_MEMBER(cgenie_state::cgenie_fdc_intrq_w) } } -const wd17xx_interface cgenie_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - WRITE8_MEMBER( cgenie_state::cgenie_motor_w ) { fd1793_device *fdc = machine().device<fd1793_device>("wd179x"); diff --git a/src/mess/machine/concept_exp.c b/src/mess/machine/concept_exp.c index 00e35b9210e..58a88cd41a4 100644 --- a/src/mess/machine/concept_exp.c +++ b/src/mess/machine/concept_exp.c @@ -196,11 +196,6 @@ WRITE_LINE_MEMBER(concept_fdc_device::drq_w) m_fdc_local_status &= ~LS_DRQ_mask; } -const wd17xx_interface concept_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - READ8_MEMBER(concept_fdc_device::reg_r) { switch (offset) @@ -320,7 +315,7 @@ static const floppy_interface concept_floppy_interface = static MACHINE_CONFIG_FRAGMENT( fdc ) - MCFG_FD1793_ADD("wd179x", concept_wd17xx_interface ) + MCFG_FD1793_ADD("wd179x", default_wd17xx_interface ) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(concept_fdc_device, intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(concept_fdc_device, drq_w)) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(concept_floppy_interface) diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c index 51937a5820b..288db7e759a 100644 --- a/src/mess/machine/dgn_beta.c +++ b/src/mess/machine/dgn_beta.c @@ -800,11 +800,6 @@ WRITE_LINE_MEMBER(dgn_beta_state::dgnbeta_fdc_drq_w) cpu1_recalc_firq(state); } -const wd17xx_interface dgnbeta_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - READ8_MEMBER(dgn_beta_state::dgnbeta_wd2797_r) { int result = 0; diff --git a/src/mess/machine/dgnalpha.c b/src/mess/machine/dgnalpha.c index 3a7f9eed344..aa704f53c61 100644 --- a/src/mess/machine/dgnalpha.c +++ b/src/mess/machine/dgnalpha.c @@ -372,14 +372,3 @@ WRITE_LINE_MEMBER( dragon_alpha_state::fdc_drq_w ) { m_pia_2->cb1_w(state ? ASSERT_LINE : CLEAR_LINE); } - - - -//------------------------------------------------- -// fdc_interface -//------------------------------------------------- - -const wd17xx_interface dragon_alpha_state::fdc_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; diff --git a/src/mess/machine/mbc55x.c b/src/mess/machine/mbc55x.c index 2370f16f4fc..b0275f858a7 100644 --- a/src/mess/machine/mbc55x.c +++ b/src/mess/machine/mbc55x.c @@ -33,15 +33,6 @@ static int instruction_hook(device_t &device, offs_t curpc); //static void fdc_reset(running_machine &machine); //static void set_disk_int(running_machine &machine, int state); - -/* Floppy drives WD2793 */ - -const wd17xx_interface mbc55x_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - - /* 8255 Configuration */ READ8_MEMBER( mbc55x_state::ppi8255_r ) diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index f545889d0e3..6b58642aef1 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -37,12 +37,6 @@ WRITE_LINE_MEMBER(nascom1_state::nascom2_fdc_drq_w) m_nascom2_fdc.drq = state; } -const wd17xx_interface nascom2_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - - READ8_MEMBER(nascom1_state::nascom2_fdc_select_r) { return m_nascom2_fdc.select | 0xa0; diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index c3a5df0a991..1231d9a8966 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -251,11 +251,6 @@ WRITE_LINE_MEMBER(svi318_state::svi_fdc_drq_w) m_fdc.drq = state; } -const wd17xx_interface svi_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, NULL, NULL} -}; - WRITE8_MEMBER(svi318_state::svi318_fdc_drive_motor_w) { fd1793_device *fdc = machine().device<fd1793_device>("wd179x"); diff --git a/src/mess/machine/swtpc09.c b/src/mess/machine/swtpc09.c index 1320d069cd1..70c3e67a90b 100644 --- a/src/mess/machine/swtpc09.c +++ b/src/mess/machine/swtpc09.c @@ -244,13 +244,6 @@ void swtpc09_state::swtpc09_irq_handler(UINT8 peripheral, UINT8 state) } } -/******* WD1791 FDC *******/ -/* wd1791 fdc interface */ -const wd17xx_interface swtpc09_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 } -}; - /* handlers for fdc */ WRITE_LINE_MEMBER( swtpc09_state::fdc_intrq_w ) { diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c index bf8eeaf6d4e..e21af1fdf5c 100644 --- a/src/mess/machine/trs80.c +++ b/src/mess/machine/trs80.c @@ -680,11 +680,6 @@ WRITE_LINE_MEMBER(trs80_state::trs80_fdc_intrq_w) } } -const wd17xx_interface trs80_wd17xx_interface = -{ - {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} -}; - /************************************* * * |