diff options
author | 2019-01-02 23:40:39 +0100 | |
---|---|---|
committer | 2019-01-02 23:40:39 +0100 | |
commit | 0fc7707b802b51e159d0b57a2309b6cb5e7ad45e (patch) | |
tree | f44f6234e6be13d7765bc8bf6afe8226bcfb47d9 /src/mame/drivers/battlera.cpp | |
parent | fbe69b5f0c35890443287ee1058230ffb51beaa4 (diff) |
-devices/sound/msm5205: Removed unused MCFG_MSM6585 macros, nw
-audio/irem, drivers/appoooh, cabal, chinsan, combatsc, crgolf, dacholer, darius, ddragon, de_2: Removed MACHINE_CONFIG macros, nw
-drivers/ashnojoe, battlera: Removed MACHINE_CONFIG macros and updated to use non-legacy MSM5205 VCK callback, nw
Diffstat (limited to 'src/mame/drivers/battlera.cpp')
-rw-r--r-- | src/mame/drivers/battlera.cpp | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 375de03892c..0151c326346 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -102,7 +102,12 @@ void battlera_state::machine_start() { save_item(NAME(m_control_port_select)); save_item(NAME(m_msm5205next)); - save_item(NAME(m_toggle)); +} + +void battlera_state::machine_reset() +{ + m_control_port_select = 0; + m_msm5205next = 0; } /******************************************************************************/ @@ -151,8 +156,7 @@ WRITE_LINE_MEMBER(battlera_state::adpcm_int) m_msm->write_data(m_msm5205next >> 4); m_msm5205next <<= 4; - m_toggle = 1 - m_toggle; - if (m_toggle) + if (state) m_audiocpu->set_input_line(1, HOLD_LINE); } @@ -250,8 +254,8 @@ uint32_t battlera_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -MACHINE_CONFIG_START(battlera_state::battlera) - +void battlera_state::battlera(machine_config &config) +{ /* basic machine hardware */ H6280(config, m_maincpu, 21477200/3); m_maincpu->set_addrmap(AS_PROGRAM, &battlera_state::battlera_map); @@ -267,20 +271,20 @@ MACHINE_CONFIG_START(battlera_state::battlera) m_audiocpu->add_route(ALL_OUTPUTS, "mono", 0.60); // music data is stereo, but hardware isn't /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242) - MCFG_SCREEN_UPDATE_DRIVER( battlera_state, screen_update ) - MCFG_SCREEN_PALETTE("huc6260") + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242); + m_screen->set_screen_update(FUNC(battlera_state::screen_update)); + m_screen->set_palette(m_huc6260); - MCFG_DEVICE_ADD( "huc6260", HUC6260, MAIN_CLOCK ) - MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel)) - MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event)) - MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed)) - MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed)) + HUC6260(config, m_huc6260, MAIN_CLOCK); + m_huc6260->next_pixel_data().set("huc6270", FUNC(huc6270_device::next_pixel)); + m_huc6260->time_til_next_event().set("huc6270", FUNC(huc6270_device::time_until_next_event)); + m_huc6260->vsync_changed().set("huc6270", FUNC(huc6270_device::vsync_changed)); + m_huc6260->hsync_changed().set("huc6270", FUNC(huc6270_device::hsync_changed)); - MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 ) - MCFG_HUC6270_VRAM_SIZE(0x20000) - MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0)) + huc6270_device &huc6270(HUC6270(config, "huc6270", 0)); + huc6270.set_vram_size(0x20000); + huc6270.irq().set_inputline(m_maincpu, 0); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -288,14 +292,13 @@ MACHINE_CONFIG_START(battlera_state::battlera) GENERIC_LATCH_8(config, m_soundlatch); m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, 0); - MCFG_DEVICE_ADD("ymsnd", YM2203, 12000000 / 8) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) + YM2203(config, "ymsnd", 12000000 / 8).add_route(ALL_OUTPUTS, "mono", 0.40); - MCFG_DEVICE_ADD("msm", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, battlera_state, adpcm_int)) /* interrupt function */ - MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85) -MACHINE_CONFIG_END + MSM5205(config, m_msm, 384000); + m_msm->vck_callback().set(FUNC(battlera_state::adpcm_int)); + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ + m_msm->add_route(ALL_OUTPUTS, "mono", 0.85); +} /******************************************************************************/ |