diff options
Diffstat (limited to 'src/mame/drivers/forte2.cpp')
-rw-r--r-- | src/mame/drivers/forte2.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index 078a0d8c0cc..c2327fcedd4 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -61,8 +61,8 @@ private: void io_mem(address_map &map); void program_mem(address_map &map); - DECLARE_READ8_MEMBER(forte2_ay8910_read_input); - DECLARE_WRITE8_MEMBER(forte2_ay8910_set_input_mask); + DECLARE_READ8_MEMBER(ay8910_read_input); + DECLARE_WRITE8_MEMBER(ay8910_set_input_mask); required_device<cpu_device> m_maincpu; @@ -102,12 +102,12 @@ static INPUT_PORTS_START( pesadelo ) INPUT_PORTS_END -READ8_MEMBER(forte2_state::forte2_ay8910_read_input) +READ8_MEMBER(forte2_state::ay8910_read_input) { return ioport("IN0")->read() | (m_input_mask & 0x3f); } -WRITE8_MEMBER(forte2_state::forte2_ay8910_set_input_mask) +WRITE8_MEMBER(forte2_state::ay8910_set_input_mask) { /* PSG reg 15, writes 0 at coin insert, 0xff at boot and game over */ m_input_mask = data; @@ -125,12 +125,12 @@ void forte2_state::machine_start() } -MACHINE_CONFIG_START(forte2_state::pesadelo) - +void forte2_state::pesadelo(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545)) - MCFG_DEVICE_PROGRAM_MAP(program_mem) - MCFG_DEVICE_IO_MAP(io_mem) + Z80(config, m_maincpu, XTAL(3'579'545)); + m_maincpu->set_addrmap(AS_PROGRAM, &forte2_state::program_mem); + m_maincpu->set_addrmap(AS_IO, &forte2_state::io_mem); /* video hardware */ tms9928a_device &vdp(TMS9928A(config, "tms9928a", XTAL(10'738'635))); @@ -141,11 +141,11 @@ MACHINE_CONFIG_START(forte2_state::pesadelo) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(3'579'545)/2) - MCFG_AY8910_PORT_A_READ_CB(READ8(*this, forte2_state, forte2_ay8910_read_input)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, forte2_state, forte2_ay8910_set_input_mask)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END + ay8910_device &aysnd(AY8910(config, "aysnd", XTAL(3'579'545)/2)); + aysnd.port_a_read_callback().set(FUNC(forte2_state::ay8910_read_input)); + aysnd.port_b_write_callback().set(FUNC(forte2_state::ay8910_set_input_mask)); + aysnd.add_route(ALL_OUTPUTS, "mono", 0.50); +} void forte2_state::init_pesadelo() { |