diff options
Diffstat (limited to 'src/mess/drivers/mirage.c')
-rw-r--r-- | src/mess/drivers/mirage.c | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 25f395860fb..0687cbdbcd0 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -78,10 +78,10 @@ public: DECLARE_WRITE8_MEMBER(mirage_via_write_portb); DECLARE_READ8_MEMBER(mirage_via_read_porta); DECLARE_READ8_MEMBER(mirage_via_read_portb); - DECLARE_READ8_MEMBER(mirage_via_read_ca1); - DECLARE_READ8_MEMBER(mirage_via_read_cb1); - DECLARE_READ8_MEMBER(mirage_via_read_ca2); - DECLARE_READ8_MEMBER(mirage_via_read_cb2); + DECLARE_READ_LINE_MEMBER(mirage_via_read_ca1); + DECLARE_READ_LINE_MEMBER(mirage_via_read_cb1); + DECLARE_READ_LINE_MEMBER(mirage_via_read_ca2); + DECLARE_READ_LINE_MEMBER(mirage_via_read_cb2); DECLARE_WRITE_LINE_MEMBER(acia_irq_w); @@ -239,47 +239,30 @@ READ8_MEMBER(mirage_state::mirage_via_read_portb) } // external sync pulse -READ8_MEMBER(mirage_state::mirage_via_read_ca1) +READ_LINE_MEMBER(mirage_state::mirage_via_read_ca1) { return 0; } // keyscan -READ8_MEMBER(mirage_state::mirage_via_read_cb1) +READ_LINE_MEMBER(mirage_state::mirage_via_read_cb1) { return 0; } // keyscan -READ8_MEMBER(mirage_state::mirage_via_read_ca2) +READ_LINE_MEMBER(mirage_state::mirage_via_read_ca2) { return 0; } // keyscan -READ8_MEMBER(mirage_state::mirage_via_read_cb2) +READ_LINE_MEMBER(mirage_state::mirage_via_read_cb2) { return 0; } -const via6522_interface mirage_via = -{ - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_porta), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_portb), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_ca1), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_cb1), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_ca2), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_read_cb2), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_write_porta), - DEVCB_DRIVER_MEMBER(mirage_state, mirage_via_write_portb), - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_CPU_INPUT_LINE("maincpu", M6809_IRQ_LINE) -}; - static ACIA6850_INTERFACE( mirage_acia6850_interface ) { 0, // tx clock @@ -300,7 +283,16 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_VIA6522_ADD("via6522", 1000000, mirage_via) + MCFG_DEVICE_ADD("via6522", VIA6522, 1000000) + MCFG_VIA6522_READPA_HANDLER(READ8(mirage_state, mirage_via_read_porta)) + MCFG_VIA6522_READPB_HANDLER(READ8(mirage_state, mirage_via_read_portb)) + MCFG_VIA6522_READCA1_HANDLER(READLINE(mirage_state, mirage_via_read_ca1)) + MCFG_VIA6522_READCB1_HANDLER(READLINE(mirage_state, mirage_via_read_cb1)) + MCFG_VIA6522_READCA2_HANDLER(READLINE(mirage_state, mirage_via_read_ca2)) + MCFG_VIA6522_READCB2_HANDLER(READLINE(mirage_state, mirage_via_read_cb2)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mirage_state, mirage_via_write_porta)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mirage_state, mirage_via_write_portb)) + MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line)) MCFG_ACIA6850_ADD("acia6850", mirage_acia6850_interface) |