summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/uapce.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/uapce.cpp')
-rw-r--r--src/mame/drivers/uapce.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp
index 44dc5315740..5fbf2ceb453 100644
--- a/src/mame/drivers/uapce.cpp
+++ b/src/mame/drivers/uapce.cpp
@@ -99,7 +99,6 @@ Alien Crush & Pac_Land: dumps made from PC-Engine dumps of JP versions
#include "cpu/z80/z80.h"
#include "video/huc6260.h"
#include "video/huc6270.h"
-#include "sound/c6280.h"
#include "sound/discrete.h"
#include "screen.h"
@@ -296,10 +295,6 @@ void uapce_state::pce_mem(address_map &map)
map(0x1F0000, 0x1F1FFF).ram().mirror(0x6000);
map(0x1FE000, 0x1FE3FF).rw("huc6270", FUNC(huc6270_device::read), FUNC(huc6270_device::write));
map(0x1FE400, 0x1FE7FF).rw(m_huc6260, FUNC(huc6260_device::read), FUNC(huc6260_device::write));
- map(0x1FE800, 0x1FEBFF).rw("c6280", FUNC(c6280_device::c6280_r), FUNC(c6280_device::c6280_w));
- map(0x1FEC00, 0x1FEFFF).rw(m_maincpu, FUNC(h6280_device::timer_r), FUNC(h6280_device::timer_w));
- map(0x1FF000, 0x1FF3FF).rw(FUNC(uapce_state::pce_joystick_r), FUNC(uapce_state::pce_joystick_w));
- map(0x1FF400, 0x1FF7FF).rw(m_maincpu, FUNC(h6280_device::irq_status_r), FUNC(h6280_device::irq_status_w));
}
void uapce_state::pce_io(address_map &map)
@@ -310,9 +305,13 @@ void uapce_state::pce_io(address_map &map)
MACHINE_CONFIG_START(uapce_state::uapce)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_DEVICE_PROGRAM_MAP(pce_mem)
- MCFG_DEVICE_IO_MAP(pce_io)
+ H6280(config, m_maincpu, PCE_MAIN_CLOCK/3);
+ m_maincpu->set_addrmap(AS_PROGRAM, pce_mem);
+ m_maincpu->set_addrmap(AS_IO, pce_io);
+ m_maincpu->port_in_cb().set(FUNC(uapce_state::pce_joystick_r));
+ m_maincpu->port_out_cb().set(FUNC(uapce_state::pce_joystick_w));
+ m_maincpu->add_route(0, "lspeaker", 0.5);
+ m_maincpu->add_route(1, "rspeaker", 0.5);
MCFG_DEVICE_ADD("sub", Z80, 1400000)
MCFG_DEVICE_PROGRAM_MAP(z80_map)
@@ -336,10 +335,6 @@ MACHINE_CONFIG_START(uapce_state::uapce)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
- MCFG_C6280_CPU("maincpu")
- MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
- MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MCFG_DEVICE_ADD("discrete", DISCRETE, uapce_discrete)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)