diff options
Diffstat (limited to 'src/mame/drivers/jpmmps.cpp')
-rw-r--r-- | src/mame/drivers/jpmmps.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index 80ec4239389..c2f759d8a91 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -184,19 +184,19 @@ void jpmmps_state::jpmmps_map(address_map &map) void jpmmps_state::jpmmps_io_map(address_map &map) { - map.global_mask(0xff); - map(0x0000, 0x001f).rw(UART_IC5, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite)); + map.global_mask(0x1ff); + map(0x0000, 0x003f).rw(UART_IC5, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite)); -// AM_RANGE(0x0020, 0x0020) // power fail -// AM_RANGE(0x0021, 0x0021) // wd timeout -// AM_RANGE(0x0022, 0x0022) // invalid access -// AM_RANGE(0x0023, 0x0023) // clear down +// AM_RANGE(0x0040, 0x0041) // power fail +// AM_RANGE(0x0042, 0x0043) // wd timeout +// AM_RANGE(0x0044, 0x0045) // invalid access +// AM_RANGE(0x0046, 0x0047) // clear down -// AM_RANGE(0x0026, 0x0026) // uart4 int -// AM_RANGE(0x0027, 0x0027) // uart2 int +// AM_RANGE(0x004c, 0x004d) // uart4 int +// AM_RANGE(0x004e, 0x004f) // uart2 int - map(0x0040, 0x005f).rw(UART_IC10, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite)); - map(0x0060, 0x0067).w("mainlatch", FUNC(ls259_device::write_d0)); + map(0x0080, 0x00bf).rw(UART_IC10, FUNC(tms9902_device::cruread), FUNC(tms9902_device::cruwrite)); + map(0x00c0, 0x00cf).w("mainlatch", FUNC(ls259_device::write_d0)); } @@ -248,8 +248,8 @@ void jpmmps_state::machine_reset() m_maincpu->reset_line(ASSERT_LINE); } -MACHINE_CONFIG_START(jpmmps_state::jpmmps) - +void jpmmps_state::jpmmps(machine_config &config) +{ // CPU TMS9995, standard variant; no line connections TMS9995(config, m_maincpu, MAIN_CLOCK); m_maincpu->set_addrmap(AS_PROGRAM, &jpmmps_state::jpmmps_map); @@ -284,14 +284,13 @@ MACHINE_CONFIG_START(jpmmps_state::jpmmps) SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("sn", SN76489, SOUND_CLOCK) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) + SN76489(config, m_psg, SOUND_CLOCK); + m_psg->add_route(ALL_OUTPUTS, "mono", 1.00); - MCFG_DEVICE_ADD("meters", METERS, 0) - MCFG_METERS_NUMBER(9) // TODO: meters.cpp sets a max of 8 + METERS(config, m_meters, 0).set_number(9); // TODO: meters.cpp sets a max of 8 config.set_default_layout(layout_jpmmps); -MACHINE_CONFIG_END +} |