From 0bb396ae6f5ca1e5b7fba19ffb0aa590871ebe60 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Wed, 31 Oct 2018 20:47:18 +0700 Subject: v53: overhaul An attempt to add the NEC V50 to the existing V53/V53A devices. Also overhauled for devcb3, and made some required changes to the peripherals. Because this is a pretty wide-ranging change, I thought I'd solicit feedback before merging it. * v53: refactor and add v50, devcb3, use templates and other general cleanup * am9517a: add 16 bit transfer support to v5x_dmau variant * i8251: minor tidy on v5x_scu variant * hng64: update to match v53 changes * mpc3000: update to match v53 changes --- src/devices/cpu/nec/v53.cpp | 629 ++++++++++++++++------------------------ src/devices/cpu/nec/v53.h | 344 ++++++++-------------- src/devices/machine/am9517a.cpp | 93 +++++- src/devices/machine/am9517a.h | 34 ++- src/devices/machine/i8251.cpp | 47 ++- src/devices/machine/i8251.h | 25 +- src/mame/audio/hng64.cpp | 32 +- src/mame/drivers/mpc3000.cpp | 24 +- 8 files changed, 555 insertions(+), 673 deletions(-) diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index 5b31c6bcb7e..1d20dd544e7 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -1,137 +1,86 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -/* V53 */ - -// V33 / V33A cores with onboard peripherals - -// Interrupt Controller is uPD71059 equivalent (a PIC8259 clone?) -// DMA Controller can operate in modes providing a subset of the uPD71071 or uPD71037 functionality (some modes unavailable / settings ignored) (uPD71071 mode is an extended 8237A, uPD71037 mode is plain 8237A) -// Serial Controller is based on the uPD71051 but with some changes (i8251 clone?) -// Timer Unit is functionally identical to uPD71054 (which in turn is said to be the same as a pit8253) +/* + * NEC V5x devices consist of a V3x CPU core plus integrated peripherals. The + * CPU cores within each device are as follows: + * + * Device CPU + * V50/µPD70216 V30/µPD70116 + * V53/µPD70236 V33/µPD70136 + * V53A/µPD70236A V33A//µPD70136A + * + * The peripherals are nearly identical between all three devices: + * + * Name Description Device + * TCU Timer/Counter Unit µPD71054/i8254 subset + * DMAU DMA Control Unit µPD71071 equivalent + * ICU Interrupt control Unit µPD71059/i8259 equivalent + * SCU Serial Control Unit µPD71051/i8251 subset (async only) + * + * The V53/V53A DMAU also supports a configurable µPD71037/i8237A mode. + * + * Sources: + * + * http://www.chipfind.net/datasheet/pdf/nec/upd70236.pdf + * https://datasheet.datasheetarchive.com/originals/scans/Scans-107/DSASCANS15-59637.pdf + * + */ #include "emu.h" #include "v53.h" #include "necpriv.h" +#define VERBOSE 0 +#include "logmacro.h" - +DEFINE_DEVICE_TYPE(V50, v50_device, "v50", "NEC V50") DEFINE_DEVICE_TYPE(V53, v53_device, "v53", "NEC V53") DEFINE_DEVICE_TYPE(V53A, v53a_device, "v53a", "NEC V53A") -WRITE8_MEMBER(v53_base_device::BSEL_w) -{ - //printf("v53: BSEL_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::BADR_w) -{ - //printf("v53: BADR_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::BRC_w) -{ - //printf("v53: BRC_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WMB0_w) -{ - //printf("v53: WMB0_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WCY1_w) -{ - //printf("v53: WCY1_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WCY0_w) -{ - //printf("v53: WCY0_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WAC_w) -{ - //printf("v53: WAC_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::TCKS_w) -{ - //printf("v53: TCKS_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::SBCR_w) -{ - //printf("v53: SBCR_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::REFC_w) -{ - //printf("v53: REFC_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WMB1_w) -{ - //printf("v53: WMB1_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WCY2_w) -{ - //printf("v53: WCY2_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WCY3_w) +WRITE8_MEMBER(v5x_base_device::SULA_w) { - //printf("v53: WCY3_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::WCY4_w) -{ - //printf("v53: WCY4_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::SULA_w) -{ - //printf("v53: SULA_w %02x\n", data); + LOG("SULA_w %02x\n", data); m_SULA = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::TULA_w) +WRITE8_MEMBER(v5x_base_device::TULA_w) { - //printf("v53: TULA_w %02x\n", data); + LOG("TULA_w %02x\n", data); m_TULA = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::IULA_w) +WRITE8_MEMBER(v5x_base_device::IULA_w) { - //printf("v53: IULA_w %02x\n", data); + LOG("IULA_w %02x\n", data); m_IULA = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::DULA_w) +WRITE8_MEMBER(v5x_base_device::DULA_w) { - //printf("v53: DULA_w %02x\n", data); + LOG("DULA_w %02x\n", data); m_DULA = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::OPHA_w) +WRITE8_MEMBER(v5x_base_device::OPHA_w) { - //printf("v53: OPHA_w %02x\n", data); + LOG("OPHA_w %02x\n", data); m_OPHA = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::OPSEL_w) +WRITE8_MEMBER(v5x_base_device::OPSEL_w) { - //printf("v53: OPSEL_w %02x\n", data); + LOG("OPSEL_w %02x\n", data); m_OPSEL = data; install_peripheral_io(); } -WRITE8_MEMBER(v53_base_device::SCTL_w) +WRITE8_MEMBER(v53_device::SCTL_w) { // bit 7: unused // bit 6: unused @@ -142,10 +91,27 @@ WRITE8_MEMBER(v53_base_device::SCTL_w) // bit 1: uPD71037 DMA mode enable (otherwise in uPD71071 mode) // bit 0: Onboard pripheral I/O maps to 8-bit boundaries? (otherwise 16-bit) - //printf("v53: SCTL_w %02x\n", data); + LOG("SCTL_w %02x\n", data); m_SCTL = data; install_peripheral_io(); } + +WRITE8_MEMBER(v50_device::OPCN_w) +{ + // bit 7: unused + // bit 6: unused + // bit 5: unused + // bit 4: unused + // bit 3: IRSW + // bit 2: IRSW + // bit 1: PF + // bit 0: PF + + LOG("OPCN_w %02x\n", data); + m_OPCN = data; + install_peripheral_io(); +} + /* m_WCY0 = 0x07; m_WCY1 = 0x77; @@ -172,11 +138,10 @@ m_DST = 0x00; m_DMK = 0x0f; */ -void v53_base_device::device_reset() +void v5x_base_device::device_reset() { v33_base_device::device_reset(); - m_SCTL = 0x00; m_OPSEL= 0x00; // peripheral addresses @@ -185,61 +150,56 @@ void v53_base_device::device_reset() m_IULA = 0x00; m_DULA = 0x00; m_OPHA = 0x00; +} + +void v50_device::device_reset() +{ + v5x_base_device::device_reset(); + + m_OPCN = 0; +} - m_simk = 0x03; +void v53_device::device_reset() +{ + v5x_base_device::device_reset(); + + m_SCTL = 0x00; } -void v53_base_device::device_start() +void v5x_base_device::device_start() { v33_base_device::device_start(); - m_txd_handler.resolve_safe(); - m_rts_handler.resolve_safe(); - m_dtr_handler.resolve_safe(); - m_rxrdy_handler.resolve_safe(); - m_txrdy_handler.resolve_safe(); - m_txempty_handler.resolve_safe(); - - m_out0_handler.resolve_safe(); - m_out1_handler.resolve_safe(); - m_out2_handler.resolve_safe(); - - m_out_hreq_cb.resolve_safe(); - m_out_eop_cb.resolve_safe(); - m_in_memr_cb.resolve_safe(0); - m_out_memw_cb.resolve_safe(); - m_in_ior_0_cb.resolve_safe(0); - m_in_ior_1_cb.resolve_safe(0); - m_in_ior_2_cb.resolve_safe(0); - m_in_ior_3_cb.resolve_safe(0); - m_out_iow_0_cb.resolve_safe(); - m_out_iow_1_cb.resolve_safe(); - m_out_iow_2_cb.resolve_safe(); - m_out_iow_3_cb.resolve_safe(); - m_out_dack_0_cb.resolve_safe(); - m_out_dack_1_cb.resolve_safe(); - m_out_dack_2_cb.resolve_safe(); - m_out_dack_3_cb.resolve_safe(); - - set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(pic8259_device::inta_cb), (pic8259_device*)m_v53icu)); + set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(v5x_icu_device::inta_cb), m_icu.target())); - save_item(NAME(m_SCTL)); save_item(NAME(m_OPSEL)); save_item(NAME(m_SULA)); save_item(NAME(m_TULA)); save_item(NAME(m_IULA)); save_item(NAME(m_DULA)); save_item(NAME(m_OPHA)); +} + +void v50_device::device_start() +{ + v5x_base_device::device_start(); + + save_item(NAME(m_OPCN)); +} + +void v53_device::device_start() +{ + v5x_base_device::device_start(); - save_item(NAME(m_simk)); + save_item(NAME(m_SCTL)); } -void v53_base_device::device_post_load() +void v5x_base_device::device_post_load() { install_peripheral_io(); } -void v53_base_device::install_peripheral_io() +void v53_device::install_peripheral_io() { // unmap everything in I/O space up to the fixed position registers (we avoid overwriting them, it isn't a valid config) space(AS_IO).unmap_readwrite(0x1000, 0xfeff); // todo, we need to have a way to NOT unmap things defined in the drivers, but instead have this act as an overlay mapping / unampping only!! @@ -248,12 +208,11 @@ void v53_base_device::install_peripheral_io() // the hng64.c games first set everything up in 8-bit mode, then // do the procedure again in 16-bit mode before using them?! - int IOAG = m_SCTL & 1; + int const IOAG = m_SCTL & 1; - if (m_OPSEL & 0x01) // DMA Unit available + if (m_OPSEL & OPSEL_DS) { - uint16_t base = (m_OPHA << 8) | m_DULA; - base &= 0xfffe; + u16 const base = ((m_OPHA << 8) | m_DULA) & 0xfffe; if (m_SCTL & 0x02) // uPD71037 mode { @@ -265,232 +224,169 @@ void v53_base_device::install_peripheral_io() } } else // uPD71071 mode - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x0f, read8_delegate(FUNC(upd71071_v53_device::read), (upd71071_v53_device*)m_v53dmau), write8_delegate(FUNC(upd71071_v53_device::write), (upd71071_v53_device*)m_v53dmau), 0xffff); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x0f, + read8_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), + write8_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); } - if (m_OPSEL & 0x02) // Interrupt Control Unit available + if (m_OPSEL & OPSEL_IS) { - uint16_t base = (m_OPHA << 8) | m_IULA; - base &= 0xfffe; + u16 const base = ((m_OPHA << 8) | m_IULA) & 0xfffe; if (IOAG) // 8-bit - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8sm_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8sm_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0xffff); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x01, + read8sm_delegate(FUNC(v5x_icu_device::read), m_icu.target()), + write8sm_delegate(FUNC(v5x_icu_device::write), m_icu.target()), 0xffff); else - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x03, read8sm_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8sm_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0x00ff); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x03, + read8sm_delegate(FUNC(v5x_icu_device::read), m_icu.target()), + write8sm_delegate(FUNC(v5x_icu_device::write), m_icu.target()), 0x00ff); } - if (m_OPSEL & 0x04) // Timer Control Unit available + if (m_OPSEL & OPSEL_TS) { - uint16_t base = (m_OPHA << 8) | m_TULA; - //printf("installing TCU to %04x\n", base); - base &= 0xfffe; + u16 const base = ((m_OPHA << 8) | m_TULA) & 0xfffe; if (IOAG) // 8-bit - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(v53_base_device::tmu_tst0_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct0_w), this), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(v53_base_device::tmu_tst1_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct1_w), this), 0xff00); - space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8_delegate(FUNC(v53_base_device::tmu_tst2_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct2_w), this), 0x00ff); - space(AS_IO).install_write_handler(base+0x02, base+0x03, write8_delegate(FUNC(v53_base_device::tmu_tmd_w), this), 0xff00); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x03, + read8sm_delegate(FUNC(pit8253_device::read), m_tcu.target()), + write8sm_delegate(FUNC(pit8253_device::write), m_tcu.target()), 0xffff); else - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(v53_base_device::tmu_tst0_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct0_w), this), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8_delegate(FUNC(v53_base_device::tmu_tst1_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct1_w), this), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x04, base+0x05, read8_delegate(FUNC(v53_base_device::tmu_tst2_r), this), write8_delegate(FUNC(v53_base_device::tmu_tct2_w), this), 0x00ff); - space(AS_IO).install_write_handler(base+0x06, base+0x07, write8_delegate(FUNC(v53_base_device::tmu_tmd_w), this), 0x00ff); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x07, + read8sm_delegate(FUNC(pit8253_device::read), m_tcu.target()), + write8sm_delegate(FUNC(pit8253_device::write), m_tcu.target()), 0x00ff); } - if (m_OPSEL & 0x08) // Serial Control Unit available + if (m_OPSEL & OPSEL_SS) { - uint16_t base = (m_OPHA << 8) | m_SULA; - base &= 0xfffe; + u16 const base = ((m_OPHA << 8) | m_SULA) & 0xfffe; if (IOAG) // 8-bit - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8smo_delegate(FUNC(v53_scu_device::data_r), m_v53scu.target()), write8smo_delegate(FUNC(v53_scu_device::data_w), m_v53scu.target()), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8smo_delegate(FUNC(v53_scu_device::status_r), m_v53scu.target()), write8smo_delegate(FUNC(v53_scu_device::command_w), m_v53scu.target()), 0xff00); - space(AS_IO).install_write_handler(base+0x02, base+0x03, write8smo_delegate(FUNC(v53_scu_device::mode_w), m_v53scu.target()), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8_delegate(FUNC(v53_base_device::scu_simk_r), this), write8_delegate(FUNC(v53_base_device::scu_simk_w), this), 0xff00); - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x03, + read8sm_delegate(FUNC(v5x_scu_device::read), m_scu.target()), + write8sm_delegate(FUNC(v5x_scu_device::write), m_scu.target()), 0xffff); else - { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8smo_delegate(FUNC(v53_scu_device::data_r), m_v53scu.target()), write8smo_delegate(FUNC(v53_scu_device::data_w), m_v53scu.target()), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8smo_delegate(FUNC(v53_scu_device::status_r), m_v53scu.target()), write8smo_delegate(FUNC(v53_scu_device::command_w), m_v53scu.target()), 0x00ff); - space(AS_IO).install_write_handler(base+0x04, base+0x05, write8smo_delegate(FUNC(v53_scu_device::mode_w), m_v53scu.target()), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x06, base+0x07, read8_delegate(FUNC(v53_base_device::scu_simk_r), this), write8_delegate(FUNC(v53_base_device::scu_simk_w), this), 0x00ff); - - } + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x07, + read8sm_delegate(FUNC(v5x_scu_device::read), m_scu.target()), + write8sm_delegate(FUNC(v5x_scu_device::write), m_scu.target()), 0x00ff); } - -} - - - -/*** SCU ***/ - - -READ8_MEMBER(v53_base_device::scu_simk_r) -{ - //printf("v53: scu_simk_r\n"); - return m_simk; } -WRITE8_MEMBER(v53_base_device::scu_simk_w) -{ - m_simk = data; - //printf("v53: scu_simk_w %02x\n", data); -} - - - -/*** TCU ***/ - -WRITE8_MEMBER(v53_base_device::tmu_tct0_w) { m_v53tcu->write(0, data); } -WRITE8_MEMBER(v53_base_device::tmu_tct1_w) { m_v53tcu->write(1, data); } -WRITE8_MEMBER(v53_base_device::tmu_tct2_w) { m_v53tcu->write(2, data); } -WRITE8_MEMBER(v53_base_device::tmu_tmd_w) { m_v53tcu->write(3, data); } - - -READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(0); } -READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(1); } -READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(2); } - - - - - -/*** DMA ***/ - -// could be wrong / nonexistent -WRITE_LINE_MEMBER(v53_base_device::dreq0_w) +WRITE_LINE_MEMBER(v53_device::hack_w) { if (!(m_SCTL & 0x02)) - { - m_v53dmau->dreq0_w(state); - } + m_dmau->hack_w(state); else - { - //printf("v53: dreq0 not in 71071mode\n"); - } + LOG("hack_w not in 71071mode\n"); } -WRITE_LINE_MEMBER(v53_base_device::dreq1_w) +void v50_device::install_peripheral_io() { - if (!(m_SCTL & 0x02)) - { - m_v53dmau->dreq1_w(state); - } - else - { - //printf("v53: dreq1 not in 71071mode\n"); - } -} + // unmap everything in I/O space up to the fixed position registers (we avoid overwriting them, it isn't a valid config) + space(AS_IO).unmap_readwrite(0x1000, 0xfeff); // todo, we need to have a way to NOT unmap things defined in the drivers, but instead have this act as an overlay mapping / unampping only!! -WRITE_LINE_MEMBER(v53_base_device::dreq2_w) -{ - if (!(m_SCTL & 0x02)) - { - m_v53dmau->dreq2_w(state); - } - else + if (m_OPSEL & OPSEL_DS) { - //printf("v53: dreq2 not in 71071mode\n"); - } -} + u16 const base = ((m_OPHA << 8) | m_DULA) & 0xfffe; -WRITE_LINE_MEMBER(v53_base_device::dreq3_w) -{ - if (!(m_SCTL & 0x02)) - { - m_v53dmau->dreq3_w(state); + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x0f, + read8_delegate(FUNC(v5x_dmau_device::read), m_dmau.target()), + write8_delegate(FUNC(v5x_dmau_device::write), m_dmau.target()), 0xffff); } - else + + if (m_OPSEL & OPSEL_IS) { - //printf("v53: dreq3 not in 71071mode\n"); + u16 const base = ((m_OPHA << 8) | m_IULA) & 0xfffe; + + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x03, + read8sm_delegate(FUNC(v5x_icu_device::read), m_icu.target()), + write8sm_delegate(FUNC(v5x_icu_device::write), m_icu.target()), 0x00ff); } -} -WRITE_LINE_MEMBER(v53_base_device::hack_w) -{ - if (!(m_SCTL & 0x02)) + if (m_OPSEL & OPSEL_TS) { - m_v53dmau->hack_w(state); + u16 const base = ((m_OPHA << 8) | m_TULA) & 0xfffe; + + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x07, + read8sm_delegate(FUNC(pit8253_device::read), m_tcu.target()), + write8sm_delegate(FUNC(pit8253_device::write), m_tcu.target()), 0x00ff); } - else + + if (m_OPSEL & OPSEL_SS) { - //printf("v53: hack_w not in 71071mode\n"); + u16 const base = ((m_OPHA << 8) | m_SULA) & 0xfffe; + + space(AS_IO).install_readwrite_handler(base + 0x00, base + 0x07, + read8sm_delegate(FUNC(v5x_scu_device::read), m_scu.target()), + write8sm_delegate(FUNC(v5x_scu_device::write), m_scu.target()), 0x00ff); } } -/* General stuff */ - -void v53_base_device::v53_internal_port_map(address_map &map) +void v50_device::internal_port_map(address_map &map) { v33_internal_port_map(map); - map(0xffe0, 0xffe0).w(FUNC(v53_base_device::BSEL_w)); // 0xffe0 // uPD71037 DMA mode bank selection register - map(0xffe1, 0xffe1).w(FUNC(v53_base_device::BADR_w)); // 0xffe1 // uPD71037 DMA mode bank register peripheral mapping (also uses OPHA) -// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0x00ff) // 0xffe2 -// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0xff00) // 0xffe3 -// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0x00ff) // 0xffe4 -// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0xff00) // 0xffe5 -// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0x00ff) // 0xffe6 -// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0xff00) // 0xffe7 -// AM_RANGE(0xffe8, 0xffe9) // (reserved , 0x00ff) // 0xffe8 - map(0xffe9, 0xffe9).w(FUNC(v53_base_device::BRC_w)); // 0xffe9 // baud rate counter (used for serial peripheral) - map(0xffea, 0xffea).w(FUNC(v53_base_device::WMB0_w)); // 0xffea // waitstate control - map(0xffeb, 0xffeb).w(FUNC(v53_base_device::WCY1_w)); // 0xffeb // waitstate control - map(0xffec, 0xffec).w(FUNC(v53_base_device::WCY0_w)); // 0xffec // waitstate control - map(0xffed, 0xffed).w(FUNC(v53_base_device::WAC_w)); // 0xffed // waitstate control -// AM_RANGE(0xffee, 0xffef) // (reserved , 0x00ff) // 0xffee -// AM_RANGE(0xffee, 0xffef) // (reserved , 0xff00) // 0xffef - map(0xfff0, 0xfff0).w(FUNC(v53_base_device::TCKS_w)); // 0xfff0 // timer clocks - map(0xfff1, 0xfff1).w(FUNC(v53_base_device::SBCR_w)); // 0xfff1 // internal clock divider, halt behavior etc. - map(0xfff2, 0xfff2).w(FUNC(v53_base_device::REFC_w)); // 0xfff2 // ram refresh control - map(0xfff3, 0xfff3).w(FUNC(v53_base_device::WMB1_w)); // 0xfff3 // waitstate control - map(0xfff4, 0xfff4).w(FUNC(v53_base_device::WCY2_w)); // 0xfff4 // waitstate control - map(0xfff5, 0xfff5).w(FUNC(v53_base_device::WCY3_w)); // 0xfff5 // waitstate control - map(0xfff6, 0xfff6).w(FUNC(v53_base_device::WCY4_w)); // 0xfff6 // waitstate control -// AM_RANGE(0xfff6, 0xfff7) // (reserved , 0xff00) // 0xfff7 - map(0xfff8, 0xfff8).w(FUNC(v53_base_device::SULA_w)); // 0xfff8 // peripheral mapping - map(0xfff9, 0xfff9).w(FUNC(v53_base_device::TULA_w)); // 0xfff9 // peripheral mapping - map(0xfffa, 0xfffa).w(FUNC(v53_base_device::IULA_w)); // 0xfffa // peripheral mapping - map(0xfffb, 0xfffb).w(FUNC(v53_base_device::DULA_w)); // 0xfffb // peripheral mapping - map(0xfffc, 0xfffc).w(FUNC(v53_base_device::OPHA_w)); // 0xfffc // peripheral mapping (upper bits, common) - map(0xfffd, 0xfffd).w(FUNC(v53_base_device::OPSEL_w)); // 0xfffd // peripheral enabling - map(0xfffe, 0xfffe).w(FUNC(v53_base_device::SCTL_w)); // 0xfffe // peripheral configuration (& byte / word mapping) -// AM_RANGE(0xfffe, 0xffff) // (reserved , 0xff00) // 0xffff -} + map(0xfff0, 0xfff0).w(FUNC(v50_device::TCKS_w)); + map(0xfff2, 0xfff2).w(FUNC(v50_device::RFC_w)); + map(0xfff4, 0xfff4).w(FUNC(v50_device::WMB0_w)); // actually WMB on V50 + map(0xfff5, 0xfff5).w(FUNC(v50_device::WCY1_w)); + map(0xfff6, 0xfff6).w(FUNC(v50_device::WCY2_w)); -READ8_MEMBER(v53_base_device::get_pic_ack) -{ - return 0; + map(0xfff8, 0xfff8).w(FUNC(v50_device::SULA_w)); + map(0xfff9, 0xfff9).w(FUNC(v50_device::TULA_w)); + map(0xfffa, 0xfffa).w(FUNC(v50_device::IULA_w)); + map(0xfffb, 0xfffb).w(FUNC(v50_device::DULA_w)); + map(0xfffc, 0xfffc).w(FUNC(v50_device::OPHA_w)); + map(0xfffd, 0xfffd).w(FUNC(v50_device::OPSEL_w)); + map(0xfffe, 0xfffe).w(FUNC(v50_device::OPCN_w)); } +void v53_device::internal_port_map(address_map &map) +{ + v33_internal_port_map(map); + map(0xffe0, 0xffe0).w(FUNC(v53_device::BSEL_w)); // uPD71037 DMA mode bank selection register + map(0xffe1, 0xffe1).w(FUNC(v53_device::BADR_w)); // uPD71037 DMA mode bank register peripheral mapping (also uses OPHA) + // 0xffe2-0xffe9 reserved + map(0xffe9, 0xffe9).w(FUNC(v53_device::BRC_w)); // baud rate counter (used for serial peripheral) + map(0xffea, 0xffea).w(FUNC(v53_device::WMB0_w)); // waitstate control + map(0xffeb, 0xffeb).w(FUNC(v53_device::WCY1_w)); // waitstate control + map(0xffec, 0xffec).w(FUNC(v53_device::WCY0_w)); // waitstate control + map(0xffed, 0xffed).w(FUNC(v53_device::WAC_w)); // waitstate control + // 0xffee-0xffef reserved + map(0xfff0, 0xfff0).w(FUNC(v53_device::TCKS_w)); // timer clocks + map(0xfff1, 0xfff1).w(FUNC(v53_device::SBCR_w)); // internal clock divider, halt behavior etc. + map(0xfff2, 0xfff2).w(FUNC(v53_device::RFC_w)); // ram refresh control + map(0xfff3, 0xfff3).w(FUNC(v53_device::WMB1_w)); // waitstate control + map(0xfff4, 0xfff4).w(FUNC(v53_device::WCY2_w)); // waitstate control + map(0xfff5, 0xfff5).w(FUNC(v53_device::WCY3_w)); // waitstate control + map(0xfff6, 0xfff6).w(FUNC(v53_device::WCY4_w)); // waitstate control + // 0xfff6 reserved + map(0xfff8, 0xfff8).w(FUNC(v53_device::SULA_w)); // scu mapping + map(0xfff9, 0xfff9).w(FUNC(v53_device::TULA_w)); // tcu mapping + map(0xfffa, 0xfffa).w(FUNC(v53_device::IULA_w)); // icu mapping + map(0xfffb, 0xfffb).w(FUNC(v53_device::DULA_w)); // dmau mapping + map(0xfffc, 0xfffc).w(FUNC(v53_device::OPHA_w)); // peripheral mapping (upper bits, common) + map(0xfffd, 0xfffd).w(FUNC(v53_device::OPSEL_w)); // peripheral enabling + map(0xfffe, 0xfffe).w(FUNC(v53_device::SCTL_w)); // peripheral configuration (& byte / word mapping) + // 0xffff reserved +} // the external interface provides no external access to the usual IRQ line of the V33, everything goes through the interrupt controller -void v53_base_device::execute_set_input(int irqline, int state) +void v5x_base_device::execute_set_input(int irqline, int state) { switch (irqline) { - case INPUT_LINE_IRQ0: m_v53icu->ir0_w(state); break; - case INPUT_LINE_IRQ1: m_v53icu->ir1_w(state); break; - case INPUT_LINE_IRQ2: m_v53icu->ir2_w(state); break; - case INPUT_LINE_IRQ3: m_v53icu->ir3_w(state); break; - case INPUT_LINE_IRQ4: m_v53icu->ir4_w(state); break; - case INPUT_LINE_IRQ5: m_v53icu->ir5_w(state); break; - case INPUT_LINE_IRQ6: m_v53icu->ir6_w(state); break; - case INPUT_LINE_IRQ7: m_v53icu->ir7_w(state); break; + case INPUT_LINE_IRQ0: m_icu->ir0_w(state); break; + case INPUT_LINE_IRQ1: m_icu->ir1_w(state); break; + case INPUT_LINE_IRQ2: m_icu->ir2_w(state); break; + case INPUT_LINE_IRQ3: m_icu->ir3_w(state); break; + case INPUT_LINE_IRQ4: m_icu->ir4_w(state); break; + case INPUT_LINE_IRQ5: m_icu->ir5_w(state); break; + case INPUT_LINE_IRQ6: m_icu->ir6_w(state); break; + case INPUT_LINE_IRQ7: m_icu->ir7_w(state); break; case INPUT_LINE_NMI: nec_common_device::execute_set_input(irqline, state); break; case NEC_INPUT_LINE_POLL: nec_common_device::execute_set_input(irqline, state); break; @@ -498,102 +394,61 @@ void v53_base_device::execute_set_input(int irqline, int state) } // for hooking the interrupt controller output up to the core -WRITE_LINE_MEMBER(v53_base_device::internal_irq_w) +WRITE_LINE_MEMBER(v5x_base_device::internal_irq_w) { nec_common_device::execute_set_input(0, state); } - -void v53_base_device::device_add_mconfig(machine_config &config) +void v5x_base_device::device_add_mconfig(machine_config &config) { - PIT8254(config, m_v53tcu, 0); // functionality identical to uPD71054 - m_v53tcu->set_clk<0>(16000000); // manual implicitly claims that these runs at same speed as the CPU - m_v53tcu->set_clk<1>(16000000); - m_v53tcu->set_clk<2>(16000000); - m_v53tcu->out_handler<0>().set([this] (int state) { m_out0_handler(state); }); - m_v53tcu->out_handler<1>().set([this] (int state) { m_out1_handler(state); }); - m_v53tcu->out_handler<2>().set([this] (int state) { m_out2_handler(state); }); - - V53_DMAU(config, m_v53dmau, 4000000); - m_v53dmau->out_hreq_callback().set([this] (int state) { m_out_hreq_cb(state); }); - m_v53dmau->out_eop_callback().set([this] (int state) { m_out_eop_cb(state); }); - m_v53dmau->in_memr_callback().set([this] (address_space &space, offs_t offset) { return m_in_memr_cb(space, offset); }); - m_v53dmau->out_memw_callback().set([this] (address_space &space, offs_t offset, uint8_t data) { m_out_memw_cb(space, offset, data); }); - m_v53dmau->in_ior_callback<0>().set([this] (address_space &space, offs_t offset) { return m_in_ior_0_cb(space, offset); }); - m_v53dmau->in_ior_callback<1>().set([this] (address_space &space, offs_t offset) { return m_in_ior_1_cb(space, offset); }); - m_v53dmau->in_ior_callback<2>().set([this] (address_space &space, offs_t offset) { return m_in_ior_2_cb(space, offset); }); - m_v53dmau->in_ior_callback<3>().set([this] (address_space &space, offs_t offset) { return m_in_ior_3_cb(space, offset); }); - m_v53dmau->out_iow_callback<0>().set([this] (address_space &space, offs_t offset, uint8_t data) { m_out_iow_0_cb(space, offset, data); }); - m_v53dmau->out_iow_callback<1>().set([this] (address_space &space, offs_t offset, uint8_t data) { m_out_iow_1_cb(space, offset, data); }); - m_v53dmau->out_iow_callback<2>().set([this] (address_space &space, offs_t offset, uint8_t data) { m_out_iow_2_cb(space, offset, data); }); - m_v53dmau->out_iow_callback<3>().set([this] (address_space &space, offs_t offset, uint8_t data) { m_out_iow_3_cb(space, offset, data); }); - m_v53dmau->out_dack_callback<0>().set([this] (int state) { m_out_dack_0_cb(state); }); - m_v53dmau->out_dack_callback<1>().set([this] (int state) { m_out_dack_1_cb(state); }); - m_v53dmau->out_dack_callback<2>().set([this] (int state) { m_out_dack_2_cb(state); }); - m_v53dmau->out_dack_callback<3>().set([this] (int state) { m_out_dack_3_cb(state); }); - - PIC8259(config, m_v53icu, 0); - m_v53icu->out_int_callback().set(FUNC(v53_base_device::internal_irq_w)); - m_v53icu->in_sp_callback().set_constant(1); - m_v53icu->read_slave_ack_callback().set(FUNC(v53_base_device::get_pic_ack)); - - V53_SCU(config, m_v53scu, 0); - m_v53scu->txd_handler().set(FUNC(v53_base_device::scu_txd_trampoline_cb)); - m_v53scu->dtr_handler().set(FUNC(v53_base_device::scu_dtr_trampoline_cb)); - m_v53scu->rts_handler().set(FUNC(v53_base_device::scu_rts_trampoline_cb)); - m_v53scu->rxrdy_handler().set(FUNC(v53_base_device::scu_rxrdy_trampoline_cb)); - m_v53scu->txrdy_handler().set(FUNC(v53_base_device::scu_txrdy_trampoline_cb)); - m_v53scu->txempty_handler().set(FUNC(v53_base_device::scu_txempty_trampoline_cb)); - m_v53scu->syndet_handler().set(FUNC(v53_base_device::scu_syndet_trampoline_cb)); + PIT8254(config, m_tcu, 0); + m_tcu->set_clk<0>(clock()); + m_tcu->set_clk<1>(clock()); + m_tcu->set_clk<2>(clock()); + + V5X_DMAU(config, m_dmau, 4000000); + + V5X_ICU(config, m_icu, 0); + m_icu->out_int_callback().set(FUNC(v5x_base_device::internal_irq_w)); + m_icu->in_sp_callback().set_constant(1); + m_icu->read_slave_ack_callback().set(FUNC(v5x_base_device::get_pic_ack)); + + V5X_SCU(config, m_scu, 0); } +void v50_device::device_add_mconfig(machine_config &config) +{ + v5x_base_device::device_add_mconfig(config); + + // V50 timer 0 is internally connected to INT0 + m_tcu->out_handler<0>().set(m_icu, FUNC(pic8259_device::ir0_w)); +} -v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : - v33_base_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(v53_base_device::v53_internal_port_map), this)), - m_v53tcu(*this, "pit"), - m_v53dmau(*this, "upd71071dma"), - m_v53icu(*this, "upd71059pic"), - m_v53scu(*this, "v53scu"), - // SCU - m_txd_handler(*this), - m_dtr_handler(*this), - m_rts_handler(*this), - m_rxrdy_handler(*this), - m_txrdy_handler(*this), - m_txempty_handler(*this), - m_syndet_handler(*this), - // TCU - m_out0_handler(*this), - m_out1_handler(*this), - m_out2_handler(*this), - // DMAU - m_out_hreq_cb(*this), - m_out_eop_cb(*this), - m_in_memr_cb(*this), - m_out_memw_cb(*this), - m_in_ior_0_cb(*this), - m_in_ior_1_cb(*this), - m_in_ior_2_cb(*this), - m_in_ior_3_cb(*this), - m_out_iow_0_cb(*this), - m_out_iow_1_cb(*this), - m_out_iow_2_cb(*this), - m_out_iow_3_cb(*this), - m_out_dack_0_cb(*this), - m_out_dack_1_cb(*this), - m_out_dack_2_cb(*this), - m_out_dack_3_cb(*this) +v5x_base_device::v5x_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) + : v33_base_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(v5x_base_device::internal_port_map), this)) + , m_tcu(*this, "tcu") + , m_dmau(*this, "dmau") + , m_icu(*this, "icu") + , m_scu(*this, "scu") { } +v50_device::v50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : v5x_base_device(mconfig, V50, tag, owner, clock) +{ +} -v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : v53_base_device(mconfig, V53, tag, owner, clock) +v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : v5x_base_device(mconfig, V53, tag, owner, clock) { } +v53_device::v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) + : v5x_base_device(mconfig, type, tag, owner, clock) +{ +} -v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : v53_base_device(mconfig, V53A, tag, owner, clock) +v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : v53_device(mconfig, V53A, tag, owner, clock) { } diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h index 70909a619bd..47ed9a70c5b 100644 --- a/src/devices/cpu/nec/v53.h +++ b/src/devices/cpu/nec/v53.h @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -/* V53 */ + #ifndef MAME_CPU_NEC_V53_H #define MAME_CPU_NEC_V53_H @@ -13,264 +13,160 @@ #include "machine/pic8259.h" #include "machine/pit8253.h" -// SCU - -#define MCFG_V53_SCU_TXD_HANDLER(_devcb) \ - downcast(*device).set_txd_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_DTR_HANDLER(_devcb) \ - downcast(*device).set_dtr_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_RTS_HANDLER(_devcb) \ - downcast(*device).set_rts_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_RXRDY_HANDLER(_devcb) \ - downcast(*device).set_rxrdy_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_TXRDY_HANDLER(_devcb) \ - downcast(*device).set_txrdy_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_TXEMPTY_HANDLER(_devcb) \ - downcast(*device).set_txempty_handler(DEVCB_##_devcb); - -#define MCFG_V53_SCU_SYNDET_HANDLER(_devcb) \ - downcast(*device).set_syndet_handler(DEVCB_##_devcb); - -// TCU -#define MCFG_V53_TCU_CLK0(_clk) \ - downcast(*device).set_clk0(_clk); - -#define MCFG_V53_TCU_CLK1(_clk) \ - downcast(*device).set_clk1(_clk); - -#define MCFG_V53_TCU_CLK2(_clk) \ - downcast(*device).set_clk2(_clk); - -#define MCFG_V53_TCU_OUT0_HANDLER(_devcb) \ - downcast(*device).set_out0_handler(DEVCB_##_devcb); - -#define MCFG_V53_TCU_OUT1_HANDLER(_devcb) \ - downcast(*device).set_out1_handler(DEVCB_##_devcb); - -#define MCFG_V53_TCU_OUT2_HANDLER(_devcb) \ - downcast(*device).set_out2_handler(DEVCB_##_devcb); - -// DMAU - -#define MCFG_V53_DMAU_OUT_HREQ_CB(_devcb) \ - downcast(*device).set_out_hreq_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_EOP_CB(_devcb) \ - downcast(*device).set_out_eop_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_IN_MEMR_CB(_devcb) \ - downcast(*device).set_in_memr_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_MEMW_CB(_devcb) \ - downcast(*device).set_out_memw_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_IN_IOR_0_CB(_devcb) \ - downcast(*device).set_in_ior_0_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_IN_IOR_1_CB(_devcb) \ - downcast(*device).set_in_ior_1_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_IN_IOR_2_CB(_devcb) \ - downcast(*device).set_in_ior_2_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_IN_IOR_3_CB(_devcb) \ - downcast(*device).set_in_ior_3_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_IOW_0_CB(_devcb) \ - downcast(*device).set_out_iow_0_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_IOW_1_CB(_devcb) \ - downcast(*device).set_out_iow_1_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_IOW_2_CB(_devcb) \ - downcast(*device).set_out_iow_2_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_IOW_3_CB(_devcb) \ - downcast(*device).set_out_iow_3_callback(DEVCB_##_devcb); - -#define MCFG_V53_DMAU_OUT_DACK_0_CB(_devcb) \ - downcast(*device).set_out_dack_0_callback(DEVCB_##_devcb); +class v5x_base_device : public v33_base_device +{ +public: + // TCU + template void set_clk(double clk) { subdevice("tcu")->set_clk(clk); } + template void set_clk(const XTAL &xtal) { subdevice("tcu")->set_clk(xtal.dvalue()); } + template auto out_handler() { return subdevice("tcu")->out_handler(); } -#define MCFG_V53_DMAU_OUT_DACK_1_CB(_devcb) \ - downcast(*device).set_out_dack_1_callback(DEVCB_##_devcb); + // DMAU + auto out_hreq_cb() { return subdevice("dmau")->out_hreq_callback(); } + auto out_eop_cb() { return subdevice("dmau")->out_eop_callback(); } + auto in_memr_cb() { return subdevice("dmau")->in_memr_callback(); } + auto in_mem16r_cb() { return subdevice("dmau")->in_mem16r_callback(); } + auto out_memw_cb() { return subdevice("dmau")->out_memw_callback(); } + auto out_mem16w_cb() { return subdevice("dmau")->out_mem16w_callback(); } + template auto in_ior_cb() { return subdevice("dmau")->in_ior_callback(); } + template auto in_io16r_cb() { return subdevice("dmau")->in_io16r_callback(); } + template auto out_iow_cb() { return subdevice("dmau")->out_iow_callback(); } + template auto out_io16w_cb() { return subdevice("dmau")->out_io16w_callback(); } + template auto out_dack_cb() { return subdevice("dmau")->out_dack_callback(); } -#define MCFG_V53_DMAU_OUT_DACK_2_CB(_devcb) \ - downcast(*device).set_out_dack_2_callback(DEVCB_##_devcb); + // SCU + auto txd_handler_cb() { return subdevice("scu")->txd_handler(); } + auto dtr_handler_cb() { return subdevice("scu")->dtr_handler(); } + auto rts_handler_cb() { return subdevice("scu")->rts_handler(); } + auto rxrdy_handler_cb() { return subdevice("scu")->rxrdy_handler(); } + auto txrdy_handler_cb() { return subdevice("scu")->txrdy_handler(); } + auto txempty_handler_cb() { return subdevice("scu")->txempty_handler(); } + auto syndet_handler_cb() { return subdevice("scu")->syndet_handler(); } -#define MCFG_V53_DMAU_OUT_DACK_3_CB(_devcb) \ - downcast(*device).set_out_dack_3_callback(DEVCB_##_devcb); +protected: + v5x_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + // device_interface overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + // device_execute_interface overrides + virtual void execute_set_input(int inputnum, int state) override; -class v53_base_device : public v33_base_device -{ -public: - DECLARE_WRITE8_MEMBER(BSEL_w); - DECLARE_WRITE8_MEMBER(BADR_w); - DECLARE_WRITE8_MEMBER(BRC_w); - DECLARE_WRITE8_MEMBER(WMB0_w); - DECLARE_WRITE8_MEMBER(WCY1_w); - DECLARE_WRITE8_MEMBER(WCY0_w); - DECLARE_WRITE8_MEMBER(WAC_w); - DECLARE_WRITE8_MEMBER(TCKS_w); - DECLARE_WRITE8_MEMBER(SBCR_w); - DECLARE_WRITE8_MEMBER(REFC_w); - DECLARE_WRITE8_MEMBER(WMB1_w); - DECLARE_WRITE8_MEMBER(WCY2_w); - DECLARE_WRITE8_MEMBER(WCY3_w); - DECLARE_WRITE8_MEMBER(WCY4_w); + virtual void internal_port_map(address_map &map) = 0; + virtual void install_peripheral_io() = 0; + + DECLARE_WRITE8_MEMBER(BSEL_w) {} + DECLARE_WRITE8_MEMBER(BADR_w) {} + DECLARE_WRITE8_MEMBER(BRC_w) {} + DECLARE_WRITE8_MEMBER(WMB0_w) {} + DECLARE_WRITE8_MEMBER(WCY1_w) {} + DECLARE_WRITE8_MEMBER(WCY0_w) {} + DECLARE_WRITE8_MEMBER(WAC_w) {} + DECLARE_WRITE8_MEMBER(TCKS_w) {} + DECLARE_WRITE8_MEMBER(SBCR_w) {} + DECLARE_WRITE8_MEMBER(RFC_w) {} + DECLARE_WRITE8_MEMBER(WMB1_w) {} + DECLARE_WRITE8_MEMBER(WCY2_w) {} + DECLARE_WRITE8_MEMBER(WCY3_w) {} + DECLARE_WRITE8_MEMBER(WCY4_w) {} DECLARE_WRITE8_MEMBER(SULA_w); DECLARE_WRITE8_MEMBER(TULA_w); DECLARE_WRITE8_MEMBER(IULA_w); DECLARE_WRITE8_MEMBER(DULA_w); DECLARE_WRITE8_MEMBER(OPHA_w); DECLARE_WRITE8_MEMBER(OPSEL_w); - DECLARE_WRITE8_MEMBER(SCTL_w); - - // SCU - DECLARE_READ8_MEMBER(scu_simk_r); - DECLARE_WRITE8_MEMBER(scu_simk_w); - template devcb_base &set_txd_handler(Object &&cb) { return m_txd_handler.set_callback(std::forward(cb)); } - template devcb_base &set_dtr_handler(Object &&cb) { return m_dtr_handler.set_callback(std::forward(cb)); } - template devcb_base &set_rts_handler(Object &&cb) { return m_rts_handler.set_callback(std::forward(cb)); } - template devcb_base &set_rxrdy_handler(Object &&cb) { return m_rxrdy_handler.set_callback(std::forward(cb)); } - template devcb_base &set_txrdy_handler(Object &&cb) { return m_txrdy_handler.set_callback(std::forward(cb)); } - template devcb_base &set_txempty_handler(Object &&cb) { return m_txempty_handler.set_callback(std::forward(cb)); } - template devcb_base &set_syndet_handler(Object &&cb) { return m_syndet_handler.set_callback(std::forward(cb)); } - DECLARE_WRITE_LINE_MEMBER(scu_txd_trampoline_cb) { m_txd_handler(state); } - DECLARE_WRITE_LINE_MEMBER(scu_dtr_trampoline_cb) { m_dtr_handler(state); } - DECLARE_WRITE_LINE_MEMBER(scu_rts_trampoline_cb) { m_rts_handler(state); } - DECLARE_WRITE_LINE_MEMBER(scu_rxrdy_trampoline_cb) { m_rxrdy_handler(state); } /* should we mask this here based on m_simk? it can mask the interrupt */ - DECLARE_WRITE_LINE_MEMBER(scu_txrdy_trampoline_cb) { m_txrdy_handler(state); } /* should we mask this here based on m_simk? it can mask the interrupt */ - DECLARE_WRITE_LINE_MEMBER(scu_txempty_trampoline_cb) { m_txempty_handler(state); } - DECLARE_WRITE_LINE_MEMBER(scu_syndet_trampoline_cb) { m_syndet_handler(state); } + DECLARE_READ8_MEMBER(get_pic_ack) { return 0; } + DECLARE_WRITE_LINE_MEMBER(internal_irq_w); - // TCU - DECLARE_READ8_MEMBER(tmu_tst0_r); - DECLARE_WRITE8_MEMBER(tmu_tct0_w); - DECLARE_READ8_MEMBER(tmu_tst1_r); - DECLARE_WRITE8_MEMBER(tmu_tct1_w); - DECLARE_READ8_MEMBER(tmu_tst2_r); - DECLARE_WRITE8_MEMBER(tmu_tct2_w); - DECLARE_WRITE8_MEMBER(tmu_tmd_w); -// void set_clk0(double clk0) { m_clk0 = clk0; } -// void set_clk1(double clk1) { m_clk1 = clk1; } -// void set_clk2(double clk2) { m_clk2 = clk2; } - template devcb_base &set_out0_handler(Object &&cb) { return m_out0_handler.set_callback(std::forward(cb)); } - template devcb_base &set_out1_handler(Object &&cb) { return m_out1_handler.set_callback(std::forward(cb)); } - template devcb_base &set_out2_handler(Object &&cb) { return m_out2_handler.set_callback(std::forward(cb)); } + required_device m_tcu; + required_device m_dmau; + required_device m_icu; + required_device m_scu; + + enum opsel_mask + { + OPSEL_DS = 0x01, // dmau enabled + OPSEL_IS = 0x02, // icu enabled + OPSEL_TS = 0x04, // tcu enabled + OPSEL_SS = 0x08, // scu enabled + }; + u8 m_OPSEL; + + u8 m_SULA; + u8 m_TULA; + u8 m_IULA; + u8 m_DULA; + u8 m_OPHA; +}; - // DMAU - template devcb_base &set_out_hreq_callback(Object &&cb) { return m_out_hreq_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_eop_callback(Object &&cb) { return m_out_eop_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_memr_callback(Object &&cb) { return m_in_memr_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_memw_callback(Object &&cb) { return m_out_memw_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_ior_0_callback(Object &&cb) { return m_in_ior_0_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_ior_1_callback(Object &&cb) { return m_in_ior_1_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_ior_2_callback(Object &&cb) { return m_in_ior_2_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_ior_3_callback(Object &&cb) { return m_in_ior_3_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_iow_0_callback(Object &&cb) { return m_out_iow_0_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_iow_1_callback(Object &&cb) { return m_out_iow_1_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_iow_2_callback(Object &&cb) { return m_out_iow_2_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_iow_3_callback(Object &&cb) { return m_out_iow_3_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_dack_0_callback(Object &&cb) { return m_out_dack_0_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_dack_1_callback(Object &&cb) { return m_out_dack_1_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_dack_2_callback(Object &&cb) { return m_out_dack_2_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_dack_3_callback(Object &&cb) { return m_out_dack_3_cb.set_callback(std::forward(cb)); } +class v50_device : public v5x_base_device +{ +public: + v50_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - DECLARE_WRITE_LINE_MEMBER(dreq0_w); - DECLARE_WRITE_LINE_MEMBER(dreq1_w); - DECLARE_WRITE_LINE_MEMBER(dreq2_w); - DECLARE_WRITE_LINE_MEMBER(dreq3_w); - DECLARE_WRITE_LINE_MEMBER(hack_w); + template DECLARE_WRITE_LINE_MEMBER(dreq_w) { m_dmau->dreq_w(state); } + DECLARE_WRITE_LINE_MEMBER(hack_w) { m_dmau->hack_w(state); } - void v53_internal_port_map(address_map &map); protected: - v53_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides + // device_interface overrides virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; - virtual void device_post_load() override; - virtual void execute_set_input(int inputnum, int state) override; - void install_peripheral_io(); + virtual void internal_port_map(address_map &map) override; + virtual void install_peripheral_io() override; - uint8_t m_SCTL; - uint8_t m_OPSEL; + DECLARE_WRITE8_MEMBER(OPCN_w); - uint8_t m_SULA; - uint8_t m_TULA; - uint8_t m_IULA; - uint8_t m_DULA; - uint8_t m_OPHA; - - uint8_t m_simk; - - required_device m_v53tcu; - required_device m_v53dmau; - required_device m_v53icu; - required_device m_v53scu; - - // SCU - devcb_write_line m_txd_handler; - devcb_write_line m_dtr_handler; - devcb_write_line m_rts_handler; - devcb_write_line m_rxrdy_handler; - devcb_write_line m_txrdy_handler; - devcb_write_line m_txempty_handler; - devcb_write_line m_syndet_handler; +private: + u8 m_OPCN; +}; - // TCU -// double m_clk0; -// double m_clk1; -// double m_clk2; - devcb_write_line m_out0_handler; - devcb_write_line m_out1_handler; - devcb_write_line m_out2_handler; +class v53_device : public v5x_base_device +{ +public: + v53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + template DECLARE_WRITE_LINE_MEMBER(dreq_w) + { + // dreq0 could be wrong / nonexistent + if (!(m_SCTL & 0x02)) + { + m_dmau->dreq_w(state); + } + else + { + logerror("dreq%d not in 71071mode\n", Channel); + } + } + DECLARE_WRITE_LINE_MEMBER(hack_w); +protected: + v53_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); - // DMAU - devcb_write_line m_out_hreq_cb; - devcb_write_line m_out_eop_cb; - devcb_read8 m_in_memr_cb; - devcb_write8 m_out_memw_cb; - devcb_read8 m_in_ior_0_cb; - devcb_read8 m_in_ior_1_cb; - devcb_read8 m_in_ior_2_cb; - devcb_read8 m_in_ior_3_cb; - devcb_write8 m_out_iow_0_cb; - devcb_write8 m_out_iow_1_cb; - devcb_write8 m_out_iow_2_cb; - devcb_write8 m_out_iow_3_cb; - devcb_write_line m_out_dack_0_cb; - devcb_write_line m_out_dack_1_cb; - devcb_write_line m_out_dack_2_cb; - devcb_write_line m_out_dack_3_cb; + // device_interface overrides + virtual void device_start() override; + virtual void device_reset() override; - DECLARE_READ8_MEMBER(get_pic_ack); - DECLARE_WRITE_LINE_MEMBER(internal_irq_w); -}; + virtual void internal_port_map(address_map &map) override; + virtual void install_peripheral_io() override; + DECLARE_WRITE8_MEMBER(SCTL_w); -class v53_device : public v53_base_device -{ -public: - v53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +private: + u8 m_SCTL; }; -class v53a_device : public v53_base_device +class v53a_device : public v53_device { public: - v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); }; +DECLARE_DEVICE_TYPE(V50, v50_device) DECLARE_DEVICE_TYPE(V53, v53_device) DECLARE_DEVICE_TYPE(V53A, v53a_device) diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index cd6955b63ed..463f1c447ef 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -52,7 +52,7 @@ //************************************************************************** DEFINE_DEVICE_TYPE(AM9517A, am9517a_device, "am9517a", "AM9517A") -DEFINE_DEVICE_TYPE(V53_DMAU, upd71071_v53_device, "v53_dmau", "V53 DMAU") +DEFINE_DEVICE_TYPE(V5X_DMAU, v5x_dmau_device, "v5x_dmau", "V5X DMAU") DEFINE_DEVICE_TYPE(PCXPORT_DMAC, pcxport_dmac_device, "pcx_dmac", "PC Transporter DMAC") @@ -132,7 +132,7 @@ enum // dma_request - //------------------------------------------------- -inline void am9517a_device::dma_request(int channel, int state) +void am9517a_device::dma_request(int channel, int state) { LOG("AM9517A Channel %u DMA Request: %u\n", channel, state); @@ -215,7 +215,7 @@ inline void am9517a_device::set_eop(int state) //------------------------------------------------- -// dma_read - +// get_state1 - //------------------------------------------------- inline int am9517a_device::get_state1(bool msb_changed) @@ -235,7 +235,7 @@ inline int am9517a_device::get_state1(bool msb_changed) // dma_read - //------------------------------------------------- -inline void am9517a_device::dma_read() +void am9517a_device::dma_read() { offs_t offset = m_channel[m_current_channel].m_address; @@ -257,7 +257,7 @@ inline void am9517a_device::dma_read() // dma_write - //------------------------------------------------- -inline void am9517a_device::dma_write() +void am9517a_device::dma_write() { offs_t offset = m_channel[m_current_channel].m_address; @@ -296,7 +296,7 @@ inline void am9517a_device::dma_advance() { if (MODE_ADDRESS_DECREMENT) { - m_channel[m_current_channel].m_address--; + m_channel[m_current_channel].m_address -= transfer_size(m_current_channel); m_channel[m_current_channel].m_address &= m_address_mask; if ((m_channel[m_current_channel].m_address & 0xff) == 0xff) @@ -306,7 +306,7 @@ inline void am9517a_device::dma_advance() } else { - m_channel[m_current_channel].m_address++; + m_channel[m_current_channel].m_address += transfer_size(m_current_channel); m_channel[m_current_channel].m_address &= m_address_mask; if ((m_channel[m_current_channel].m_address & 0xff) == 0x00) @@ -430,8 +430,13 @@ am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, d { } -upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : am9517a_device(mconfig, V53_DMAU, tag, owner, clock) +v5x_dmau_device::v5x_dmau_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : am9517a_device(mconfig, V5X_DMAU, tag, owner, clock) + , m_in_mem16r_cb(*this) + , m_out_mem16w_cb(*this) + , m_in_io16r_cb{ { *this },{ *this },{ *this },{ *this } } + , m_out_io16w_cb{ { *this },{ *this },{ *this },{ *this } } + { } @@ -686,12 +691,12 @@ void am9517a_device::execute_run() m_channel[m_current_channel].m_count--; if (MODE_ADDRESS_DECREMENT) { - m_channel[m_current_channel].m_address--; + m_channel[m_current_channel].m_address -= transfer_size(m_current_channel); m_channel[m_current_channel].m_address &= m_address_mask; } else { - m_channel[m_current_channel].m_address++; + m_channel[m_current_channel].m_address += transfer_size(m_current_channel); m_channel[m_current_channel].m_address &= m_address_mask; } @@ -980,11 +985,18 @@ WRITE_LINE_MEMBER( am9517a_device::dreq3_w ) // upd71071 register layouts //------------------------------------------------- -void upd71071_v53_device::device_start() +void v5x_dmau_device::device_start() { am9517a_device::device_start(); m_address_mask = 0x00ffffff; + m_in_mem16r_cb.resolve_safe(0); + m_out_mem16w_cb.resolve_safe(); + for (auto &cb : m_in_io16r_cb) + cb.resolve_safe(0); + for (auto &cb : m_out_io16w_cb) + cb.resolve_safe(); + m_selected_channel = 0; m_base = 0; @@ -992,7 +1004,7 @@ void upd71071_v53_device::device_start() save_item(NAME(m_base)); } -void upd71071_v53_device::device_reset() +void v5x_dmau_device::device_reset() { am9517a_device::device_reset(); @@ -1001,7 +1013,7 @@ void upd71071_v53_device::device_reset() } -READ8_MEMBER(upd71071_v53_device::read) +READ8_MEMBER(v5x_dmau_device::read) { uint8_t ret = 0; int channel = m_selected_channel; @@ -1085,7 +1097,7 @@ READ8_MEMBER(upd71071_v53_device::read) return ret; } -WRITE8_MEMBER(upd71071_v53_device::write) +WRITE8_MEMBER(v5x_dmau_device::write) { int channel = m_selected_channel; @@ -1182,6 +1194,57 @@ WRITE8_MEMBER(upd71071_v53_device::write) } +void v5x_dmau_device::dma_read() +{ + if (m_channel[m_current_channel].m_mode & 0x1) + { + offs_t const offset = m_channel[m_current_channel].m_address >> 1; + + switch (MODE_TRANSFER_MASK) + { + case MODE_TRANSFER_VERIFY: + case MODE_TRANSFER_WRITE: + m_temp = m_in_io16r_cb[m_current_channel](offset); + break; + + case MODE_TRANSFER_READ: + m_temp = m_in_mem16r_cb(offset); + break; + } + } + else + am9517a_device::dma_read(); +} + +void v5x_dmau_device::dma_write() +{ + if (m_channel[m_current_channel].m_mode & 0x1) + { + offs_t const offset = m_channel[m_current_channel].m_address >> 1; + + switch (MODE_TRANSFER_MASK) + { + case MODE_TRANSFER_VERIFY: + { + u16 const v1 = m_in_mem16r_cb(offset); + if (0 && m_temp != v1) + logerror("verify error %04x vs. %04x\n", m_temp, v1); + } + break; + + case MODE_TRANSFER_WRITE: + m_out_mem16w_cb(offset, m_temp); + break; + + case MODE_TRANSFER_READ: + m_out_io16w_cb[m_current_channel](offset, m_temp); + break; + } + } + else + am9517a_device::dma_write(); +} + void pcxport_dmac_device::device_reset() { m_state = STATE_SI; diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index 365246f60c6..37390a930d3 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -68,6 +68,7 @@ public: DECLARE_WRITE_LINE_MEMBER( ready_w ); DECLARE_WRITE_LINE_MEMBER( eop_w ); + template DECLARE_WRITE_LINE_MEMBER( dreq_w ) { dma_request(C, state); } DECLARE_WRITE_LINE_MEMBER( dreq0_w ); DECLARE_WRITE_LINE_MEMBER( dreq1_w ); DECLARE_WRITE_LINE_MEMBER( dreq2_w ); @@ -83,6 +84,11 @@ protected: virtual void end_of_process(); + virtual void dma_read(); + virtual void dma_write(); + + virtual int transfer_size(int const channel) const { return 1; } + int m_icount; uint32_t m_address_mask; @@ -110,15 +116,13 @@ protected: uint8_t m_request; private: - inline void dma_request(int channel, int state); + void dma_request(int channel, int state); inline bool is_request_active(int channel); inline bool is_software_request_active(int channel); inline void set_hreq(int state); inline void set_dack(); inline void set_eop(int state); inline int get_state1(bool msb_changed); - inline void dma_read(); - inline void dma_write(); inline void dma_advance(); devcb_write_line m_out_hreq_cb; @@ -133,11 +137,17 @@ private: }; -class upd71071_v53_device : public am9517a_device +class v5x_dmau_device : public am9517a_device { public: // construction/destruction - upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v5x_dmau_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + auto in_mem16r_callback() { return m_in_mem16r_cb.bind(); } + auto out_mem16w_callback() { return m_out_mem16w_cb.bind(); } + + template auto in_io16r_callback() { return m_in_io16r_cb[C].bind(); } + template auto out_io16w_callback() { return m_out_io16w_cb[C].bind(); } virtual DECLARE_READ8_MEMBER( read ) override; virtual DECLARE_WRITE8_MEMBER( write ) override; @@ -147,10 +157,20 @@ protected: virtual void device_start() override; virtual void device_reset() override; + virtual void dma_read() override; + virtual void dma_write() override; + + virtual int transfer_size(int const channel) const override { return (m_channel[channel].m_mode & 0x1) ? 2 : 1; } + + // 16 bit transfer callbacks + devcb_read16 m_in_mem16r_cb; + devcb_write16 m_out_mem16w_cb; + devcb_read16 m_in_io16r_cb[4]; + devcb_write16 m_out_io16w_cb[4]; + int m_selected_channel; int m_base; uint8_t m_command_high; - }; @@ -170,7 +190,7 @@ protected: // device type definition DECLARE_DEVICE_TYPE(AM9517A, am9517a_device) -DECLARE_DEVICE_TYPE(V53_DMAU, upd71071_v53_device) +DECLARE_DEVICE_TYPE(V5X_DMAU, v5x_dmau_device) DECLARE_DEVICE_TYPE(PCXPORT_DMAC, pcxport_dmac_device) #endif // MAME_MACHINE_AM9517_H diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp index da883cd7b06..69883c412af 100644 --- a/src/devices/machine/i8251.cpp +++ b/src/devices/machine/i8251.cpp @@ -26,7 +26,7 @@ //************************************************************************** DEFINE_DEVICE_TYPE(I8251, i8251_device, "i8251", "Intel 8251 USART") -DEFINE_DEVICE_TYPE(V53_SCU, v53_scu_device, "v63_scu", "NEC V53 SCU") +DEFINE_DEVICE_TYPE(V5X_SCU, v5x_scu_device, "v5x_scu", "NEC V5X SCU") //------------------------------------------------- @@ -61,8 +61,8 @@ i8251_device::i8251_device(const machine_config &mconfig, const char *tag, devic { } -v53_scu_device::v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : i8251_device(mconfig, V53_SCU, tag, owner, clock) +v5x_scu_device::v5x_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : i8251_device(mconfig, V5X_SCU, tag, owner, clock) { } @@ -740,3 +740,44 @@ READ_LINE_MEMBER(i8251_device::txrdy_r) { return is_tx_enabled() && (m_status & I8251_STATUS_TX_READY) != 0; } + +void v5x_scu_device::device_start() +{ + i8251_device::device_start(); + + save_item(NAME(m_simk)); +} + +void v5x_scu_device::device_reset() +{ + // FIXME: blindly copied from v53.cpp - not verified + m_simk = 0x03; + + i8251_device::device_reset(); +} + +u8 v5x_scu_device::read(offs_t offset) +{ + u8 data = 0; + + switch (offset) + { + case 0: data = data_r(); break; + case 1: data = status_r(); break; + case 2: break; + case 3: data = simk_r(); break; + } + + return data; +} + +void v5x_scu_device::write(offs_t offset, uint8_t data) +{ + switch (offset) + { + case 0: data_w(data); break; + case 1: control_w(data); break; + case 2: mode_w(data); break; + case 3: simk_w(data); break; + } +} diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h index 4a9f7bb3eba..4e2773c3e40 100644 --- a/src/devices/machine/i8251.h +++ b/src/devices/machine/i8251.h @@ -43,8 +43,8 @@ public: uint8_t status_r(); void control_w(uint8_t data); - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); + virtual uint8_t read(offs_t offset); + virtual void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( write_rxd ); DECLARE_WRITE_LINE_MEMBER( write_cts ); @@ -138,20 +138,31 @@ private: uint8_t m_tx_data; }; -class v53_scu_device : public i8251_device +class v5x_scu_device : public i8251_device { public: // construction/destruction - v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + v5x_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void command_w(uint8_t data) { i8251_device::command_w(data); } - void mode_w(uint8_t data) { i8251_device::mode_w(data); } + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; + +protected: + virtual void device_start() override; + virtual void device_reset() override; + + // TODO: currently unimplemented interrupt masking + u8 simk_r() { return m_simk; } + void simk_w(u8 data) { m_simk = data; } + +private: + u8 m_simk; }; // device type definition DECLARE_DEVICE_TYPE(I8251, i8251_device) -DECLARE_DEVICE_TYPE(V53_SCU, v53_scu_device) +DECLARE_DEVICE_TYPE(V5X_SCU, v5x_scu_device) #endif // MAME_MACHINE_I8251_H diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index 4642dc5f8c7..5af0531c01c 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -201,7 +201,7 @@ WRITE16_MEMBER(hng64_state::hng64_sound_port_0008_w) // seems to one or more of the DMARQ on the V53, writes here when it expects DMA channel 3 to transfer ~0x20 bytes just after startup /* TODO: huh? */ - m_audiocpu->dreq3_w(data&0x1); + m_audiocpu->dreq_w<3>(data&0x1); m_dsp->l7a1045_sound_w(space,8/2,data,mem_mask); // m_audiocpu->hack_w(1); @@ -388,23 +388,23 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb) -MACHINE_CONFIG_START(hng64_state::hng64_audio) - MCFG_DEVICE_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz! - MCFG_DEVICE_PROGRAM_MAP(hng_sound_map) - MCFG_DEVICE_IO_MAP(hng_sound_io) - MCFG_V53_DMAU_OUT_HREQ_CB(WRITELINE(*this, hng64_state, dma_hreq_cb)) - MCFG_V53_DMAU_IN_MEMR_CB(READ8(*this, hng64_state, dma_memr_cb)) - MCFG_V53_DMAU_OUT_IOW_3_CB(WRITE8(*this, hng64_state,dma_iow3_cb)) +void hng64_state::hng64_audio(machine_config &config) +{ + V53A(config, m_audiocpu, 32000000/2); // V53A, 16? mhz! + m_audiocpu->set_addrmap(AS_PROGRAM, &hng64_state::hng_sound_map); + m_audiocpu->set_addrmap(AS_IO, &hng64_state::hng_sound_io); + m_audiocpu->out_hreq_cb().set(FUNC(hng64_state::dma_hreq_cb)); + m_audiocpu->in_memr_cb().set(FUNC(hng64_state::dma_memr_cb)); + m_audiocpu->out_iow_cb<3>().set(FUNC(hng64_state::dma_iow3_cb)); - MCFG_V53_TCU_OUT0_HANDLER(WRITELINE(*this, hng64_state, tcu_tm0_cb)) - MCFG_V53_TCU_OUT1_HANDLER(WRITELINE(*this, hng64_state, tcu_tm1_cb)) - MCFG_V53_TCU_OUT2_HANDLER(WRITELINE(*this, hng64_state, tcu_tm2_cb)) + m_audiocpu->out_handler<0>().set(FUNC(hng64_state::tcu_tm0_cb)); + m_audiocpu->out_handler<1>().set(FUNC(hng64_state::tcu_tm1_cb)); + m_audiocpu->out_handler<2>().set(FUNC(hng64_state::tcu_tm2_cb)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("l7a1045", L7A1045, 32000000/2 ) // ?? - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - -MACHINE_CONFIG_END + L7A1045(config, m_dsp, 32000000/2); // ?? + m_dsp->add_route(0, "lspeaker", 1.0); + m_dsp->add_route(1, "rspeaker", 1.0); +} diff --git a/src/mame/drivers/mpc3000.cpp b/src/mame/drivers/mpc3000.cpp index fee0ca9f1aa..0d9704e04d3 100644 --- a/src/mame/drivers/mpc3000.cpp +++ b/src/mame/drivers/mpc3000.cpp @@ -90,7 +90,7 @@ public: void init_mpc3000(); private: - required_device m_maincpu; + required_device m_maincpu; required_device m_lcdc; required_device m_dsp; required_device m_mdout; @@ -126,7 +126,7 @@ WRITE16_MEMBER(mpc3000_state::dsp_0008_hack_w) { // this is related to the DSP's DMA capability. The DSP // connects to the V53's DMA3 channel on both the MPCs and HNG64. - m_maincpu->dreq3_w(data&0x1); + m_maincpu->dreq_w<3>(data&0x1); m_dsp->l7a1045_sound_w(space,8/2,data,mem_mask); } @@ -170,18 +170,13 @@ PALETTE_INIT_MEMBER(mpc3000_state, mpc3000) void mpc3000_state::mpc3000(machine_config &config) { - // V53A isn't devcb3 compliant yet. - //V53A(config, m_maincpu, 16_MHz_XTAL); - //m_maincpu->set_addrmap(AS_PROGRAM, &mpc3000_state::mpc3000_map); - //m_maincpu->set_addrmap(AS_IO, &mpc3000_state::mpc3000_io_map); - device_t *device = nullptr; - MCFG_DEVICE_ADD("maincpu", V53A, 16_MHz_XTAL) - MCFG_DEVICE_PROGRAM_MAP(mpc3000_map) - MCFG_DEVICE_IO_MAP(mpc3000_io_map) - MCFG_V53_DMAU_OUT_HREQ_CB(WRITELINE("maincpu", v53_base_device, hack_w)) - MCFG_V53_DMAU_IN_MEMR_CB(READ8(*this, mpc3000_state, dma_memr_cb)) - MCFG_V53_DMAU_IN_IOR_3_CB(WRITE8("dsp", l7a1045_sound_device, dma_r_cb)) - MCFG_V53_DMAU_OUT_IOW_3_CB(WRITE8("dsp", l7a1045_sound_device, dma_w_cb)) + V53A(config, m_maincpu, 16_MHz_XTAL); + m_maincpu->set_addrmap(AS_PROGRAM, &mpc3000_state::mpc3000_map); + m_maincpu->set_addrmap(AS_IO, &mpc3000_state::mpc3000_io_map); + m_maincpu->out_hreq_cb().set(m_maincpu, FUNC(v53a_device::hack_w)); + m_maincpu->in_memr_cb().set(FUNC(mpc3000_state::dma_memr_cb)); + m_maincpu->in_ior_cb<3>().set(m_dsp, FUNC(l7a1045_sound_device::dma_r_cb)); + m_maincpu->out_iow_cb<3>().set(m_dsp, FUNC(l7a1045_sound_device::dma_w_cb)); hc259_device &loledlatch(HC259(config, "loledlatch")); loledlatch.q_out_cb<0>().set_output("led0").invert(); // Edit Loop @@ -203,6 +198,7 @@ void mpc3000_state::mpc3000(machine_config &config) hiledlatch.q_out_cb<6>().set_output("led14").invert(); // 16 Levels hiledlatch.q_out_cb<7>().set_output("led15").invert(); // After + device_t *device = nullptr; MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(80) MCFG_SCREEN_UPDATE_DEVICE("lcdc", hd61830_device, screen_update) -- cgit v1.2.3