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/vip.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/vip.cpp')
-rw-r--r-- | src/mame/drivers/vip.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index bd77b9031fb..909c6b0cdee 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -270,7 +270,7 @@ READ8_MEMBER(vip_state::read) int cdef = !((offset >= 0xc00) && (offset < 0x1000)); int minh = 0; - uint8_t data = m_exp->program_r(offset, cs, cdef, &minh); + uint8_t data = m_exp->program_r(space, offset, cs, cdef, &minh); if (cs) { @@ -295,7 +295,7 @@ WRITE8_MEMBER(vip_state::write) int cdef = !((offset >= 0xc00) && (offset < 0x1000)); int minh = 0; - m_exp->program_w(offset, data, cdef, &minh); + m_exp->program_w(space, offset, data, cdef, &minh); if (!cs && !minh) { @@ -310,7 +310,7 @@ WRITE8_MEMBER(vip_state::write) READ8_MEMBER(vip_state::io_r) { - uint8_t data = m_exp->io_r(offset); + uint8_t data = m_exp->io_r(space, offset); switch (offset) { @@ -339,7 +339,7 @@ READ8_MEMBER(vip_state::io_r) WRITE8_MEMBER(vip_state::io_w) { - m_exp->io_w(offset, data); + m_exp->io_w(space, offset, data); switch (offset) { @@ -695,7 +695,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip ) //************************************************************************** //------------------------------------------------- -// machine_config( vip ) +// MACHINE_CONFIG( vip ) //------------------------------------------------- MACHINE_CONFIG_START(vip_state::vip) @@ -728,24 +728,23 @@ MACHINE_CONFIG_START(vip_state::vip) // sound hardware SPEAKER(config, "mono").front_center(); - DISCRETE(config, m_beeper, vip_discrete); - m_beeper->add_route(ALL_OUTPUTS, "mono", 0.80); + MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, vip_discrete) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - VIP_BYTEIO_PORT(config, m_byteio, vip_byteio_cards, nullptr); - m_byteio->inst_callback().set(FUNC(vip_state::byteio_inst_w)); - VIP_EXPANSION_SLOT(config, m_exp, 3.52128_MHz_XTAL / 2, vip_expansion_cards, nullptr); - m_exp->int_wr_callback().set(FUNC(vip_state::exp_int_w)); - m_exp->dma_out_wr_callback().set(FUNC(vip_state::exp_dma_out_w)); - m_exp->dma_in_wr_callback().set(FUNC(vip_state::exp_dma_in_w)); + MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, nullptr, WRITELINE(*this, vip_state, byteio_inst_w)) + MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, 3.52128_MHz_XTAL / 2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vip_state, exp_int_w)) + MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vip_state, exp_dma_out_w)) + MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vip_state, exp_dma_in_w)) // devices - MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x") - CASSETTE(config, m_cassette); - m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); - m_cassette->set_interface("vip_cass"); + MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0) + MCFG_CASSETTE_ADD("cassette") + MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED) + MCFG_CASSETTE_INTERFACE("vip_cass") // software lists - SOFTWARE_LIST(config, "cass_list").set_original("vip"); + MCFG_SOFTWARE_LIST_ADD("cass_list", "vip") // internal ram RAM(config, m_ram).set_default_size("2K").set_extra_options("4K"); @@ -753,7 +752,7 @@ MACHINE_CONFIG_END //------------------------------------------------- -// machine_config( vp111 ) +// MACHINE_CONFIG( vp111 ) //------------------------------------------------- void vip_state::vp111(machine_config &config) |