diff options
author | Curt Coder <curtcoder@mail.com> | 2014-05-12 12:44:21 +0000 |
---|---|---|
committer | Curt Coder <curtcoder@mail.com> | 2014-05-12 12:44:21 +0000 |
commit | fa528bc91c2c479093a29de4a801381dcec26cf9 (patch) | |
tree | 9bb100a7174cf75b6276daa0276bdb4d05914ad8 | |
parent | 1b96913a72ef2f7828cc3f7577d14dd204fe96fa (diff) |
wd17xx: devcb2. (nw)
37 files changed, 19 insertions, 51 deletions
diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/emu/bus/bml3/bml3mp1802.c index dbda88a12c2..1254e03eb46 100644 --- a/src/emu/bus/bml3/bml3mp1802.c +++ b/src/emu/bus/bml3/bml3mp1802.c @@ -37,7 +37,6 @@ WRITE_LINE_MEMBER( bml3bus_mp1802_device::bml3_wd17xx_intrq_w ) const wd17xx_interface bml3_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1} }; diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c index d1b681db8ab..66259167723 100644 --- a/src/emu/bus/coco/coco_fdc.c +++ b/src/emu/bus/coco/coco_fdc.c @@ -148,7 +148,6 @@ WRITE_LINE_MEMBER( coco_fdc_device::fdc_drq_w ) static const wd17xx_interface coco_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0,FLOPPY_1,FLOPPY_2,FLOPPY_3} }; diff --git a/src/emu/bus/ti99_peb/bwg.c b/src/emu/bus/ti99_peb/bwg.c index c1a4b1bd06c..1d46b3e2668 100644 --- a/src/emu/bus/ti99_peb/bwg.c +++ b/src/emu/bus/ti99_peb/bwg.c @@ -1106,7 +1106,6 @@ void snug_bwg_legacy_device::device_reset() const wd17xx_interface bwgleg_wd17xx_interface = { - DEVCB_NULL, { PFLOPPY_0, PFLOPPY_1, PFLOPPY_2, PFLOPPY_3 } }; diff --git a/src/emu/bus/ti99_peb/ti_fdc.c b/src/emu/bus/ti99_peb/ti_fdc.c index d740625f852..d8c21278bfd 100644 --- a/src/emu/bus/ti99_peb/ti_fdc.c +++ b/src/emu/bus/ti99_peb/ti_fdc.c @@ -440,7 +440,6 @@ const device_type TI99_FDC = &device_creator<ti_fdc_device>; const wd17xx_interface ti_wd17xx_interface = { - DEVCB_NULL, { PFLOPPY_0, PFLOPPY_1, PFLOPPY_2, NULL } }; diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index 28eb8221995..af2fd832e16 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -288,12 +288,12 @@ static const UINT8 track_SD[][2] = { const wd17xx_interface default_wd17xx_interface = { - DEVCB_NULL, { FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} + { FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; const wd17xx_interface default_wd17xx_interface_2_drives = { - DEVCB_NULL, { FLOPPY_0, FLOPPY_1, NULL, NULL} + { FLOPPY_0, FLOPPY_1, NULL, NULL} }; @@ -1974,13 +1974,15 @@ const device_type WD1770 = &device_creator<wd1770_device>; wd1770_device::wd1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WD1770, "WD1770_LEGACY", tag, owner, clock, "wd1770_l", __FILE__), m_out_intrq_func(*this), - m_out_drq_func(*this) + m_out_drq_func(*this), + m_in_dden_func(*this) { } wd1770_device::wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_out_intrq_func(*this), - m_out_drq_func(*this) + m_out_drq_func(*this), + m_in_dden_func(*this) { } @@ -2014,7 +2016,7 @@ void wd1770_device::device_start() m_timer_ws = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(wd1770_device::wd17xx_write_sector_callback),this)); /* resolve callbacks */ - m_in_dden_func.resolve(m_intf->in_dden_func, *this); + m_in_dden_func.resolve(); m_out_intrq_func.resolve_safe(); m_out_drq_func.resolve_safe(); diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h index 06fb31a5c03..80271a90919 100644 --- a/src/emu/machine/wd17xx.h +++ b/src/emu/machine/wd17xx.h @@ -23,10 +23,12 @@ #define MCFG_WD17XX_DRQ_CALLBACK(_write) \ devcb = &wd1770_device::set_drq_wr_callback(*device, DEVCB2_##_write); +#define MCFG_WD17XX_DDEN_CALLBACK(_write) \ + devcb = &wd1770_device::set_dden_rd_callback(*device, DEVCB2_##_write); + /* Interface */ struct wd17xx_interface { - devcb_read_line in_dden_func; const char *floppy_drive_tags[4]; }; @@ -45,6 +47,7 @@ public: template<class _Object> static devcb2_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_intrq_func.set_callback(object); } template<class _Object> static devcb2_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_drq_func.set_callback(object); } + template<class _Object> static devcb2_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_in_dden_func.set_callback(object); } /* the following are not strictly part of the wd179x hardware/emulation but will be put here for now until the flopdrv code has been finalised more */ @@ -109,9 +112,9 @@ protected: // internal state /* callbacks */ - devcb_resolved_read_line m_in_dden_func; devcb2_write_line m_out_intrq_func; devcb2_write_line m_out_drq_func; + devcb2_read_line m_in_dden_func; /* input lines */ int m_mr; /* master reset */ diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index 822f49489c0..670aa480ccd 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -1965,7 +1965,6 @@ void fm7_state::machine_reset() static const wd17xx_interface fm7_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index a5833b04e73..b282204eb1e 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -391,7 +391,6 @@ DISCRETE_SOUND_END const wd17xx_interface hector_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, NULL, NULL, NULL} // Only one floppy on the minidisc }; diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c index 441e1f6b79c..e3eebe521bd 100644 --- a/src/mess/drivers/jupiter.c +++ b/src/mess/drivers/jupiter.c @@ -193,7 +193,6 @@ static const floppy_interface jupiter_floppy_interface = static const wd17xx_interface fdc_intf = { - DEVCB_NULL, { FLOPPY_0, FLOPPY_1, NULL, NULL } }; diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index f4381c3d354..cda235bfecf 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -177,7 +177,6 @@ WRITE8_MEMBER( mbc200_state::porta_w ) static const wd17xx_interface mbc200_mb8876_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; static const floppy_interface mbc200_floppy_interface = diff --git a/src/mess/drivers/mbc55x.c b/src/mess/drivers/mbc55x.c index 3126c0a3ac3..b97a4b1dad8 100644 --- a/src/mess/drivers/mbc55x.c +++ b/src/mess/drivers/mbc55x.c @@ -282,6 +282,7 @@ static MACHINE_CONFIG_START( mbc55x, mbc55x_state ) MCFG_FD1793_ADD(FDC_TAG, mbc55x_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) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(mbc55x_floppy_interface) /* Software list */ diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c index 08d6a8a6792..b45e0c92073 100644 --- a/src/mess/drivers/ms0515.c +++ b/src/mess/drivers/ms0515.c @@ -136,7 +136,6 @@ INPUT_PORTS_END static const wd17xx_interface ms0515_wd17xx_interface = { - DEVCB_LINE_VCC, { FLOPPY_0, NULL, NULL, NULL } }; @@ -237,6 +236,7 @@ static MACHINE_CONFIG_START( ms0515, ms0515_state ) MCFG_CPU_PROGRAM_MAP(ms0515_mem) MCFG_FD1793_ADD( "vg93", ms0515_wd17xx_interface ) + 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 8341b4a3f3c..1106b7ab312 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -235,7 +235,6 @@ GFXDECODE_END static const wd17xx_interface myb3k_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index f5eb48d119c..e0334368609 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -778,7 +778,6 @@ READ8_MEMBER(mz2000_state::mz2000_pio1_porta_r) static const wd17xx_interface mz2000_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index a1a42f95b24..249f9120328 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -1201,7 +1201,6 @@ WRITE8_MEMBER(mz2500_state::mz2500_fdc_w) static const wd17xx_interface mz2500_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c index 18252e77691..70672267c92 100644 --- a/src/mess/drivers/nascom1.c +++ b/src/mess/drivers/nascom1.c @@ -332,6 +332,7 @@ static MACHINE_CONFIG_DERIVED( nascom2, nascom1 ) MCFG_FD1793_ADD("wd1793", nascom2_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) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(nascom2_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c index 21f5105b7a9..d9fa0bb5aba 100644 --- a/src/mess/drivers/osbexec.c +++ b/src/mess/drivers/osbexec.c @@ -421,17 +421,6 @@ WRITE_LINE_MEMBER(osbexec_state::osbexec_pia1_irq) } -#if 0 -static const wd17xx_interface osbexec_wd17xx_interface = -{ - DEVCB_NULL, - DEVCB_DEVICE_LINE_MEMBER( "pia1", pia6821_device, cb1_w ), - DEVCB_NULL, - { FLOPPY_0, FLOPPY_1, NULL, NULL} -}; -#endif - - /* * The Osborne Executive supports the following disc formats: (TODO: Verify) * - Osborne single density: 40 tracks, 10 sectors per track, 256-byte sectors (100 KByte) @@ -607,6 +596,7 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state ) MCFG_Z80SIO2_ADD("sio", MAIN_CLOCK/6, 0, 0, 0, 0) MCFG_MB8877_ADD("mb8877", default_wd17xx_interface_2_drives ) + MCFG_WD17XX_INTRQ_CALLBACK(DEVWRITELINE("pia1", pia6821_device, cb1_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(osbexec_floppy_interface) diff --git a/src/mess/drivers/pk8020.c b/src/mess/drivers/pk8020.c index 22fbb646233..2452b72fe55 100644 --- a/src/mess/drivers/pk8020.c +++ b/src/mess/drivers/pk8020.c @@ -157,7 +157,6 @@ static const floppy_interface pk8020_floppy_interface = static const wd17xx_interface pk8020_wd17xx_interface = { - DEVCB_LINE_VCC, { FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 } }; @@ -226,6 +225,7 @@ static MACHINE_CONFIG_START( pk8020, pk8020_state ) MCFG_DEVICE_ADD("lan", I8251, 0) MCFG_FD1793_ADD("wd1793", pk8020_wd17xx_interface) + MCFG_WD17XX_DDEN_CALLBACK(VCC) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index c33acd94240..2d3cc7f3d37 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -952,7 +952,6 @@ static const floppy_interface ql_floppy_interface = wd17xx_interface ql_wd17xx_interface = { - DEVCB_DRIVER_LINE_MEMBER(ql_state,disk_io_dden_r), {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; @@ -1123,6 +1122,7 @@ static MACHINE_CONFIG_START( ql, ql_state ) MCFG_WD1772_ADD(WD1772_TAG,ql_wd17xx_interface) MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(ql_state,disk_io_intrq_w)) MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(ql_state,disk_io_drq_w)) + MCFG_WD17XX_DDEN_CALLBACK(READLINE(ql_state,disk_io_dden_r)) MCFG_MICRODRIVE_ADD(MDV_1) MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(DEVWRITELINE(MDV_2, microdrive_image_device, comms_in_w)) MCFG_MICRODRIVE_ADD(MDV_2) diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index 5bacff27b8f..3a1869997a2 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -1196,7 +1196,6 @@ GFXDECODE_END // Rainbow Z80 polls only, no IRQ/DRQ are connected const wd17xx_interface rainbow_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index f5b7a46d5b5..6b2fe7abfcf 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -1023,7 +1023,6 @@ PALETTE_INIT_MEMBER(smc777_state, smc777) static const wd17xx_interface smc777_mb8876_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index 8a4a0934897..e8dd0e82758 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -187,7 +187,6 @@ static const floppy_interface unixpc_floppy_interface = static const wd17xx_interface unixpc_wd17xx_intf = { - DEVCB_NULL, { FLOPPY_0, NULL, NULL, NULL } }; diff --git a/src/mess/drivers/vector06.c b/src/mess/drivers/vector06.c index f76a1c4a343..430b9a9b9f9 100644 --- a/src/mess/drivers/vector06.c +++ b/src/mess/drivers/vector06.c @@ -137,7 +137,6 @@ static const floppy_interface vector_floppy_interface = const wd17xx_interface vector06_wd17xx_interface = { - DEVCB_LINE_VCC, { FLOPPY_0, FLOPPY_1, NULL, NULL} }; @@ -183,6 +182,7 @@ static MACHINE_CONFIG_START( vector06, vector06_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_FD1793_ADD("wd1793", vector06_wd17xx_interface) + MCFG_WD17XX_DDEN_CALLBACK(VCC) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(vector_floppy_interface) /* cartridge */ diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index 61084be6ffd..87b9753fce2 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -1051,7 +1051,6 @@ WRITE8_MEMBER( x1_state::x1_fdc_w ) static const wd17xx_interface x1_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; @@ -1062,7 +1061,6 @@ WRITE_LINE_MEMBER(x1_state::fdc_drq_w) static const wd17xx_interface x1turbo_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index dd0bb133973..44b0142d8c7 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -73,7 +73,6 @@ ADDRESS_MAP_END static const wd17xx_interface x1_mb8877a_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index d280a68f44c..e24c92af9ee 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -644,7 +644,6 @@ WRITE_LINE_MEMBER( z100_state::video_pia_CB2_w ) static const wd17xx_interface z207_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index 8dc9b0d9261..a295e049b2f 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1604,7 +1604,6 @@ WRITE_LINE_MEMBER(bbc_state::bbc_wd177x_drq_w) const wd17xx_interface bbc_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index f786e181fee..396f215eb7d 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -95,7 +95,6 @@ WRITE_LINE_MEMBER(beta_disk_device::wd179x_drq_w) static const wd17xx_interface beta_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c index ead2b22bddf..8a09ef79de9 100644 --- a/src/mess/machine/cgenie.c +++ b/src/mess/machine/cgenie.c @@ -432,7 +432,6 @@ WRITE_LINE_MEMBER(cgenie_state::cgenie_fdc_intrq_w) const wd17xx_interface cgenie_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/concept_exp.c b/src/mess/machine/concept_exp.c index e990c200301..00e35b9210e 100644 --- a/src/mess/machine/concept_exp.c +++ b/src/mess/machine/concept_exp.c @@ -198,7 +198,6 @@ WRITE_LINE_MEMBER(concept_fdc_device::drq_w) const wd17xx_interface concept_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c index 91512f7de6f..51937a5820b 100644 --- a/src/mess/machine/dgn_beta.c +++ b/src/mess/machine/dgn_beta.c @@ -802,7 +802,6 @@ WRITE_LINE_MEMBER(dgn_beta_state::dgnbeta_fdc_drq_w) const wd17xx_interface dgnbeta_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/dgnalpha.c b/src/mess/machine/dgnalpha.c index 37054744e9b..3a7f9eed344 100644 --- a/src/mess/machine/dgnalpha.c +++ b/src/mess/machine/dgnalpha.c @@ -381,6 +381,5 @@ WRITE_LINE_MEMBER( dragon_alpha_state::fdc_drq_w ) const wd17xx_interface dragon_alpha_state::fdc_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/mbc55x.c b/src/mess/machine/mbc55x.c index 12ce5501e95..2370f16f4fc 100644 --- a/src/mess/machine/mbc55x.c +++ b/src/mess/machine/mbc55x.c @@ -38,7 +38,6 @@ static int instruction_hook(device_t &device, offs_t curpc); const wd17xx_interface mbc55x_wd17xx_interface = { - DEVCB_LINE_GND, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index b324787fbfb..f545889d0e3 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -39,7 +39,6 @@ WRITE_LINE_MEMBER(nascom1_state::nascom2_fdc_drq_w) const wd17xx_interface nascom2_wd17xx_interface = { - DEVCB_LINE_VCC, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index 395c1ca25f7..c3a5df0a991 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -253,7 +253,6 @@ WRITE_LINE_MEMBER(svi318_state::svi_fdc_drq_w) const wd17xx_interface svi_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, NULL, NULL} }; diff --git a/src/mess/machine/swtpc09.c b/src/mess/machine/swtpc09.c index 7b561a7b450..1320d069cd1 100644 --- a/src/mess/machine/swtpc09.c +++ b/src/mess/machine/swtpc09.c @@ -248,7 +248,6 @@ void swtpc09_state::swtpc09_irq_handler(UINT8 peripheral, UINT8 state) /* wd1791 fdc interface */ const wd17xx_interface swtpc09_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3 } }; diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c index d166dbd98e6..bf8eeaf6d4e 100644 --- a/src/mess/machine/trs80.c +++ b/src/mess/machine/trs80.c @@ -682,7 +682,6 @@ WRITE_LINE_MEMBER(trs80_state::trs80_fdc_intrq_w) const wd17xx_interface trs80_wd17xx_interface = { - DEVCB_NULL, {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3} }; |