summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/nyny.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/nyny.cpp')
-rw-r--r--src/mame/drivers/nyny.cpp41
1 files changed, 20 insertions, 21 deletions
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index 70c933ae030..c8f9650be34 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -415,8 +415,8 @@ READ8_MEMBER(nyny_state::nyny_pia_1_2_r)
uint8_t ret = 0;
/* the address bits are directly connected to the chip selects */
- if (BIT(offset, 2)) ret = m_pia1->read(offset & 0x03);
- if (BIT(offset, 3)) ret = m_pia2->read_alt(offset & 0x03);
+ if (BIT(offset, 2)) ret = m_pia1->read(space, offset & 0x03);
+ if (BIT(offset, 3)) ret = m_pia2->read_alt(space, offset & 0x03);
return ret;
}
@@ -425,8 +425,8 @@ READ8_MEMBER(nyny_state::nyny_pia_1_2_r)
WRITE8_MEMBER(nyny_state::nyny_pia_1_2_w)
{
/* the address bits are directly connected to the chip selects */
- if (BIT(offset, 2)) m_pia1->write(offset & 0x03, data);
- if (BIT(offset, 3)) m_pia2->write_alt(offset & 0x03, data);
+ if (BIT(offset, 2)) m_pia1->write(space, offset & 0x03, data);
+ if (BIT(offset, 3)) m_pia2->write_alt(space, offset & 0x03, data);
}
@@ -596,25 +596,25 @@ void nyny_state::machine_reset()
*
*************************************/
-void nyny_state::nyny(machine_config &config)
-{
+MACHINE_CONFIG_START(nyny_state::nyny)
+
/* basic machine hardware */
- MC6809(config, m_maincpu, 5600000); /* 1.40 MHz? The clock signal is generated by analog chips */
- m_maincpu->set_addrmap(AS_PROGRAM, &nyny_state::nyny_main_map);
- m_maincpu->set_periodic_int(FUNC(nyny_state::update_pia_1), attotime::from_hz(25));
+ MCFG_DEVICE_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */
+ MCFG_DEVICE_PROGRAM_MAP(nyny_main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nyny_state, update_pia_1, 25)
- M6802(config, m_audiocpu, AUDIO_CPU_1_CLOCK);
- m_audiocpu->set_addrmap(AS_PROGRAM, &nyny_state::nyny_audio_1_map);
+ MCFG_DEVICE_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nyny_audio_1_map)
- M6802(config, m_audiocpu2, AUDIO_CPU_2_CLOCK);
- m_audiocpu2->set_addrmap(AS_PROGRAM, &nyny_state::nyny_audio_2_map);
+ MCFG_DEVICE_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nyny_audio_2_map)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* video hardware */
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_raw(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256); /* temporary, CRTC will configure screen */
- screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
PALETTE(config, m_palette, palette_device::RGB_3BIT);
@@ -668,11 +668,10 @@ void nyny_state::nyny(machine_config &config)
AY8910(config, "ay3", AUDIO_CPU_2_CLOCK).add_route(ALL_OUTPUTS, "speaker", 0.03);
- DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC
- voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
- vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
- vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-}
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
+ MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
+MACHINE_CONFIG_END