diff options
Diffstat (limited to 'src/mame/drivers/tv910.cpp')
-rw-r--r-- | src/mame/drivers/tv910.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp index 0cc5422dca5..fbf245f8e86 100644 --- a/src/mame/drivers/tv910.cpp +++ b/src/mame/drivers/tv910.cpp @@ -68,13 +68,13 @@ private: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); - DECLARE_READ8_MEMBER(charset_r); - DECLARE_READ8_MEMBER(kbd_ascii_r); - DECLARE_READ8_MEMBER(kbd_flags_r); + uint8_t charset_r(); + uint8_t kbd_ascii_r(); + uint8_t kbd_flags_r(); - DECLARE_WRITE8_MEMBER(vbl_ack_w); - DECLARE_WRITE8_MEMBER(nmi_ack_w); - DECLARE_WRITE8_MEMBER(control_w); + void vbl_ack_w(uint8_t data); + void nmi_ack_w(uint8_t data); + void control_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(vbl_w); @@ -124,7 +124,7 @@ void tv910_state::tv910_mem(address_map &map) map(0xf000, 0xffff).rom().region("maincpu", 0); } -WRITE8_MEMBER(tv910_state::control_w) +void tv910_state::control_w(uint8_t data) { m_control = data; #if 0 @@ -140,23 +140,23 @@ WRITE8_MEMBER(tv910_state::control_w) m_beep->set_state(BIT(data, 0)); } -READ8_MEMBER(tv910_state::charset_r) +uint8_t tv910_state::charset_r() { return m_charset->read(); } -WRITE8_MEMBER(tv910_state::nmi_ack_w) +void tv910_state::nmi_ack_w(uint8_t data) { m_maincpu->set_input_line(M6502_NMI_LINE, CLEAR_LINE); m_strobe = 0; } -READ8_MEMBER(tv910_state::kbd_ascii_r) +uint8_t tv910_state::kbd_ascii_r() { return m_transchar; } -READ8_MEMBER(tv910_state::kbd_flags_r) +uint8_t tv910_state::kbd_flags_r() { uint8_t rv = 0; ioport_value kbspecial = m_kbspecial->read(); @@ -444,7 +444,7 @@ void tv910_state::machine_start() void tv910_state::machine_reset() { - control_w(machine().dummy_space(), 0, 0); + control_w(0); } MC6845_ON_UPDATE_ADDR_CHANGED( tv910_state::crtc_update_addr ) @@ -458,7 +458,7 @@ WRITE_LINE_MEMBER(tv910_state::vbl_w) m_mainirq->in_w<0>(1); } -WRITE8_MEMBER(tv910_state::vbl_ack_w) +void tv910_state::vbl_ack_w(uint8_t data) { m_mainirq->in_w<0>(0); } @@ -509,17 +509,17 @@ MC6845_UPDATE_ROW( tv910_state::crtc_update_row ) } } -MACHINE_CONFIG_START(tv910_state::tv910) +void tv910_state::tv910(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8) - MCFG_DEVICE_PROGRAM_MAP(tv910_mem) + M6502(config, m_maincpu, MASTER_CLOCK/8); + m_maincpu->set_addrmap(AS_PROGRAM, &tv910_state::tv910_mem); - MCFG_INPUT_MERGER_ANY_HIGH("mainirq") - MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE)) + INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6502_IRQ_LINE); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 840, 0, 640, 270, 0, 240) - MCFG_SCREEN_UPDATE_DEVICE( CRTC_TAG, r6545_1_device, screen_update ) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_raw(MASTER_CLOCK, 840, 0, 640, 270, 0, 240); + screen.set_screen_update(CRTC_TAG, FUNC(r6545_1_device::screen_update)); R6545_1(config, m_crtc, MASTER_CLOCK/8); m_crtc->set_screen("screen"); @@ -556,9 +556,9 @@ MACHINE_CONFIG_START(tv910_state::tv910) rs232.cts_handler().set(ACIA_TAG, FUNC(mos6551_device::write_cts)); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("bell", BEEP, MASTER_CLOCK / 8400) // 1620 Hz (Row 10 signal) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END + BEEP(config, m_beep, MASTER_CLOCK / 8400); // 1620 Hz (Row 10 signal) + m_beep->add_route(ALL_OUTPUTS, "mono", 0.50); +} /* ROM definition */ ROM_START( tv910 ) |