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 /src/mess/drivers | |
parent | 1b96913a72ef2f7828cc3f7577d14dd204fe96fa (diff) |
wd17xx: devcb2. (nw)
Diffstat (limited to 'src/mess/drivers')
-rw-r--r-- | src/mess/drivers/fm7.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/hec2hrp.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/jupiter.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/mbc200.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/mbc55x.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/ms0515.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/myb3k.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/mz2000.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/mz2500.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/nascom1.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/osbexec.c | 12 | ||||
-rw-r--r-- | src/mess/drivers/pk8020.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/ql.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/rainbow.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/smc777.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/unixpc.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/vector06.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/x1.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/x1twin.c | 1 | ||||
-rw-r--r-- | src/mess/drivers/z100.c | 1 |
20 files changed, 7 insertions, 29 deletions
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} }; |