diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/mgavegas.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/mgavegas.cpp')
-rw-r--r-- | src/mame/drivers/mgavegas.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index 741f4ec8ce9..2b0fe10a3b8 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -292,7 +292,7 @@ uint8_t ret=0; switch (offset&0x03) { case 1: //bdir=0 BC1=1 - ret=m_ay->data_r(); + ret=m_ay->data_r(space,0); break; default: if (LOG_AY8910) @@ -313,10 +313,10 @@ WRITE8_MEMBER(mgavegas_state::w_a0) switch (offset&0x03) { case 0: //bdir=1 bc1=1 - m_ay->address_w(data); + m_ay->address_w(space,0,data ); break; case 2: //bdir=1 bc1=0 - m_ay->data_w(data); + m_ay->data_w(space,0,data ); break; /* case 1: //bdir=0 bc1=1 @@ -584,35 +584,41 @@ void mgavegas_state::init_mgavegas133() * Machine Drivers * *************************/ -void mgavegas_state::mgavegas(machine_config &config) -{ + +MACHINE_CONFIG_START(mgavegas_state::mgavegas) /* basic machine hardware */ - Z80(config, m_maincpu, CPU_CLK); - m_maincpu->set_addrmap(AS_PROGRAM, &mgavegas_state::mgavegas_map); + MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLK) + MCFG_DEVICE_PROGRAM_MAP(mgavegas_map) - TIMER(config, "int_0").configure_periodic(FUNC(mgavegas_state::int_0), attotime::from_hz(6000)); //6KHz from MSM5205 /VCK + MCFG_TIMER_DRIVER_ADD_PERIODIC("int_0", mgavegas_state, int_0, attotime::from_hz(6000)) //6KHz from MSM5205 /VCK NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - TICKET_DISPENSER(config, "hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + MCFG_TICKET_DISPENSER_ADD("hopper",attotime::from_msec(200),TICKET_MOTOR_ACTIVE_HIGH,TICKET_STATUS_ACTIVE_LOW); /* sound hardware */ + SPEAKER(config, "mono").front_center(); AY8910(config, m_ay, AY_CLK); m_ay->add_route(ALL_OUTPUTS, "mono", 0.3); m_ay->port_a_read_callback().set(FUNC(mgavegas_state::ay8910_a_r)); m_ay->port_b_read_callback().set(FUNC(mgavegas_state::ay8910_b_r)); - MSM5205(config, m_msm, MSM_CLK); - m_msm->set_prescaler_selector(msm5205_device::S64_4B); - m_msm->add_route(ALL_OUTPUTS, "filter1", 2.0); + MCFG_DEVICE_ADD("5205", MSM5205, MSM_CLK) + MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 2.0) + + + MCFG_DEVICE_ADD("filter1", FILTER_RC) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2",2.0) + MCFG_DEVICE_ADD("filter2", FILTER_RC) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) - FILTER_RC(config, "filter1").add_route(ALL_OUTPUTS, "filter2", 2.0); - FILTER_RC(config, "filter2").add_route(ALL_OUTPUTS, "mono", 2.0); /* Video */ config.set_default_layout(layout_mgavegas); -} + +MACHINE_CONFIG_END /************************* |