diff options
Diffstat (limited to 'src/mame/drivers/mz700.cpp')
-rw-r--r-- | src/mame/drivers/mz700.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 09b1625cd39..4affb3ddcee 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -189,7 +189,7 @@ void mz_state::mz800_io(address_map &map) map(0xeb, 0xeb).w(FUNC(mz_state::mz800_ramaddr_w)); map(0xf0, 0xf0).portr("atari_joy1").w(FUNC(mz_state::mz800_palette_w)); map(0xf1, 0xf1).portr("atari_joy2"); - map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::write)); + map(0xf2, 0xf2).w("sn76489n", FUNC(sn76489_device::command_w)); map(0xfc, 0xff).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); } @@ -372,25 +372,24 @@ GFXDECODE_END MACHINE DRIVERS ***************************************************************************/ -void mz_state::mz700(machine_config &config) -{ +MACHINE_CONFIG_START(mz_state::mz700) /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(17'734'470)/5); - m_maincpu->set_addrmap(AS_PROGRAM, &mz_state::mz700_mem); - m_maincpu->set_addrmap(AS_IO, &mz_state::mz700_io); + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(17'734'470)/5) + MCFG_DEVICE_PROGRAM_MAP(mz700_mem) + MCFG_DEVICE_IO_MAP(mz700_io) ADDRESS_MAP_BANK(config, "banke").set_map(&mz_state::mz700_banke).set_options(ENDIANNESS_LITTLE, 8, 16, 0x2000); MCFG_MACHINE_RESET_OVERRIDE(mz_state, mz700) /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(XTAL(17'734'470)/2, 568, 0, 40*8, 312, 0, 25*8); - m_screen->set_screen_update(FUNC(mz_state::screen_update_mz700)); - m_screen->set_palette(m_palette); - + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL(17'734'470)/2, 568, 0, 40*8, 312, 0, 25*8) + MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz700) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette, palette_device::RGB_3BIT); - GFXDECODE(config, "gfxdecode", m_palette, gfx_mz700); + + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz700) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -398,8 +397,8 @@ void mz_state::mz700(machine_config &config) SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* ne556 timers */ - TIMER(config, "cursor").configure_periodic(FUNC(mz_state::ne556_cursor_callback), attotime::from_hz(1.5)); - TIMER(config, "other").configure_periodic(FUNC(mz_state::ne556_other_callback), attotime::from_hz(34.5)); + MCFG_TIMER_DRIVER_ADD_PERIODIC("cursor", mz_state, ne556_cursor_callback, attotime::from_hz(1.5)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("other", mz_state, ne556_other_callback, attotime::from_hz(34.5)) /* devices */ PIT8253(config, m_pit, 0); @@ -418,38 +417,40 @@ void mz_state::mz700(machine_config &config) TTL74145(config, m_ls145); - CASSETTE(config, m_cassette); - m_cassette->set_formats(mz700_cassette_formats); - m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); - m_cassette->set_interface("mz_cass"); + MCFG_CASSETTE_ADD( "cassette" ) + MCFG_CASSETTE_FORMATS(mz700_cassette_formats) + MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) + MCFG_CASSETTE_INTERFACE("mz_cass") - SOFTWARE_LIST(config, "cass_list").set_original("mz700_cass"); + MCFG_SOFTWARE_LIST_ADD("cass_list","mz700_cass") /* internal ram */ RAM(config, RAM_TAG).set_default_size("64K"); -} +MACHINE_CONFIG_END -void mz_state::mz800(machine_config &config) -{ +MACHINE_CONFIG_START(mz_state::mz800) mz700(config); - config.device_remove("banke"); + MCFG_DEVICE_REMOVE("banke") /* basic machine hardware */ - m_maincpu->set_addrmap(AS_PROGRAM, &mz_state::mz800_mem); - m_maincpu->set_addrmap(AS_IO, &mz_state::mz800_io); + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(mz800_mem) + MCFG_DEVICE_IO_MAP(mz800_io) ADDRESS_MAP_BANK(config, "bankf").set_map(&mz_state::mz800_bankf).set_options(ENDIANNESS_LITTLE, 8, 16, 0x2000); MCFG_MACHINE_RESET_OVERRIDE(mz_state, mz800) - subdevice<gfxdecode_device>("gfxdecode")->set_info(gfx_mz800); + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mz800) - m_screen->set_screen_update(FUNC(mz_state::screen_update_mz800)); + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800) - SN76489(config, "sn76489n", XTAL(17'734'470)/5).add_route(ALL_OUTPUTS, "mono", 1.0); + MCFG_DEVICE_ADD("sn76489n", SN76489, XTAL(17'734'470)/5) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - config.device_remove("cass_list"); - SOFTWARE_LIST(config, "cass_list").set_original("mz800_cass"); + MCFG_DEVICE_REMOVE("cass_list") + MCFG_SOFTWARE_LIST_ADD("cass_list","mz800_cass") /* devices */ m_pit->set_clk<0>(XTAL(17'734'470)/16); @@ -460,11 +461,10 @@ void mz_state::mz800(machine_config &config) pio.out_pa_callback().set(FUNC(mz_state::mz800_z80pio_port_a_w)); pio.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w)); - CENTRONICS(config, m_centronics, centronics_devices, "printer"); + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") - output_latch_device ¢_data_out(OUTPUT_LATCH(config, "cent_data_out")); - m_centronics->set_output_latch(cent_data_out); -} + MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") +MACHINE_CONFIG_END /*************************************************************************** |