From 25b03948bf5a17fa1f9cc7b5ee60d468dbee9992 Mon Sep 17 00:00:00 2001 From: mamehaze Date: Tue, 10 Mar 2015 17:34:08 +0000 Subject: [PATCH] expose V53 device callbacks to users (nw) --- src/emu/cpu/nec/v53.c | 133 +++++++++++++++++++++++++++++++----------- src/emu/cpu/nec/v53.h | 105 +++++++++++++++++++++++++++++---- 2 files changed, 194 insertions(+), 44 deletions(-) diff --git a/src/emu/cpu/nec/v53.c b/src/emu/cpu/nec/v53.c index f7c460dbf3d..6dd857f5a58 100644 --- a/src/emu/cpu/nec/v53.c +++ b/src/emu/cpu/nec/v53.c @@ -181,11 +181,23 @@ void v53_base_device::device_reset() m_DULA = 0x00; m_OPHA = 0x00; + m_simk = 0x03; } void v53_base_device::device_start() { nec_common_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(); } void v53_base_device::install_peripheral_io() @@ -265,9 +277,9 @@ void v53_base_device::install_peripheral_io() } else { - space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(v53_base_device::scu_srb_r), this), write8_delegate(FUNC(v53_base_device::scu_stb_w), this), 0x00ff); - space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8_delegate(FUNC(v53_base_device::scu_sst_r), this), write8_delegate(FUNC(v53_base_device::scu_scm_w), this), 0x00ff); - space(AS_IO).install_write_handler(base+0x04, base+0x05, write8_delegate(FUNC(v53_base_device::scu_smd_w), this), 0x00ff); + space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(v53_scu_device::data_r), (v53_scu_device*)m_v53scu), write8_delegate(FUNC(v53_scu_device::data_w), (v53_scu_device*)m_v53scu), 0x00ff); + space(AS_IO).install_readwrite_handler(base+0x02, base+0x03, read8_delegate(FUNC(v53_scu_device::status_r), (v53_scu_device*)m_v53scu), write8_delegate(FUNC(v53_scu_device::command_w), (v53_scu_device*)m_v53scu), 0x00ff); + space(AS_IO).install_write_handler(base+0x04, base+0x05, write8_delegate(FUNC(v53_scu_device::mode_w), (v53_scu_device*)m_v53scu), 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); } @@ -279,44 +291,56 @@ void v53_base_device::install_peripheral_io() /*** SCU ***/ -READ8_MEMBER(v53_base_device::scu_srb_r) -{ - printf("v53: scu_srb_r\n"); - return 0; -} - -WRITE8_MEMBER(v53_base_device::scu_stb_w) -{ - printf("v53: scu_stb_w %02x\n", data); -} - -READ8_MEMBER(v53_base_device::scu_sst_r) -{ - printf("v53: scu_sst_r\n"); - return 0; -} - -WRITE8_MEMBER(v53_base_device::scu_scm_w) -{ - printf("v53: scu_scm_w %02x\n", data); -} - -WRITE8_MEMBER(v53_base_device::scu_smd_w) -{ - printf("v53: scu_smd_w %02x\n", data); -} READ8_MEMBER(v53_base_device::scu_simk_r) { printf("v53: scu_simk_r\n"); - return 0; + return m_simk; } WRITE8_MEMBER(v53_base_device::scu_simk_w) { + m_simk = data; printf("v53: scu_simk_w %02x\n", data); } +WRITE_LINE_MEMBER(v53_base_device::scu_txd_trampoline_cb) +{ + m_txd_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_dtr_trampoline_cb) +{ + m_dtr_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_rts_trampoline_cb) +{ + m_rts_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_rxrdy_trampoline_cb) +{ + // should we mask this here based on m_simk? it can mask the interrupt + m_rxrdy_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_txrdy_trampoline_cb) +{ + // should we mask this here based on m_simk? it can mask the interrupt + m_txrdy_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_txempty_trampoline_cb) +{ + m_txempty_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::scu_syndet_trampoline_cb) +{ + m_syndet_handler(state); +} + /*** TCU ***/ @@ -330,6 +354,24 @@ READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(space, 0); } READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(space, 1); } READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(space, 2); } + +WRITE_LINE_MEMBER(v53_base_device::tcu_out0_trampoline_cb) +{ + m_out0_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::tcu_out1_trampoline_cb) +{ + m_out1_handler(state); +} + +WRITE_LINE_MEMBER(v53_base_device::tcu_out2_trampoline_cb) +{ + m_out2_handler(state); +} + + + /*** DMA ***/ // could be wrong / nonexistent @@ -459,9 +501,15 @@ WRITE_LINE_MEMBER( v53_base_device::upd71059_irq_w) } static MACHINE_CONFIG_FRAGMENT( v53 ) + MCFG_DEVICE_ADD("pit", PIT8254, 0) // functionality identical to uPD71054 - MCFG_PIT8253_CLK0(16000000/2/8) - //MCFG_PIT8253_OUT0_HANDLER(WRITELINE(v53_base_device, pit_out0)) + MCFG_PIT8253_CLK0(1000000) // todo + MCFG_PIT8253_CLK1(1000000) // todo + MCFG_PIT8253_CLK2(1000000) // todo + MCFG_PIT8253_OUT0_HANDLER(WRITELINE( v53_base_device, tcu_out0_trampoline_cb )) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE( v53_base_device, tcu_out1_trampoline_cb )) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE( v53_base_device, tcu_out2_trampoline_cb )) + MCFG_DEVICE_ADD("upd71071dma", V53_DMAU, 4000000) MCFG_I8237_OUT_HREQ_CB(WRITELINE(v53_base_device, dma_hrq_changed)) @@ -472,6 +520,13 @@ static MACHINE_CONFIG_FRAGMENT( v53 ) MCFG_PIC8259_ADD( "upd71059pic", WRITELINE(v53_base_device, upd71059_irq_w), VCC, READ8(v53_base_device,get_pic_ack)) MCFG_DEVICE_ADD("v53scu", V53_SCU, 0) + MCFG_I8251_TXD_HANDLER(WRITELINE(v53_base_device, scu_txd_trampoline_cb)) + MCFG_I8251_DTR_HANDLER(WRITELINE(v53_base_device, scu_dtr_trampoline_cb)) + MCFG_I8251_RTS_HANDLER(WRITELINE(v53_base_device, scu_rts_trampoline_cb)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE(v53_base_device,scu_rxrdy_trampoline_cb)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE(v53_base_device,scu_txrdy_trampoline_cb)) + MCFG_I8251_TXEMPTY_HANDLER(WRITELINE(v53_base_device, scu_txempty_trampoline_cb)) + MCFG_I8251_SYNDET_HANDLER(WRITELINE(v53_base_device, scu_syndet_trampoline_cb)) MACHINE_CONFIG_END @@ -487,7 +542,19 @@ v53_base_device::v53_base_device(const machine_config &mconfig, device_type type m_v53tcu(*this, "pit"), m_v53dmau(*this, "upd71071dma"), m_v53icu(*this, "upd71059pic"), - m_v53scu(*this, "v53scu") + 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) { } diff --git a/src/emu/cpu/nec/v53.h b/src/emu/cpu/nec/v53.h index 1f2cd3fffd2..ec9d82ed262 100644 --- a/src/emu/cpu/nec/v53.h +++ b/src/emu/cpu/nec/v53.h @@ -8,6 +8,50 @@ #include "machine/pic8259.h" #include "machine/i8251.h" +// SCU + +#define MCFG_V53_SCU_TXD_HANDLER(_devcb) \ + devcb = &v53_base_device::set_txd_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_DTR_HANDLER(_devcb) \ + devcb = &v53_base_device::set_dtr_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_RTS_HANDLER(_devcb) \ + devcb = &v53_base_device::set_rts_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_RXRDY_HANDLER(_devcb) \ + devcb = &v53_base_device::set_rxrdy_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_TXRDY_HANDLER(_devcb) \ + devcb = &v53_base_device::set_txrdy_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_TXEMPTY_HANDLER(_devcb) \ + devcb = &v53_base_device::set_txempty_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_SCU_SYNDET_HANDLER(_devcb) \ + devcb = &v53_base_device::set_syndet_handler(*device, DEVCB_##_devcb); + +// TCU +#define MCFG_V53_TCU_CLK0(_clk) \ + v53_base_device::set_clk0(*device, _clk); + +#define MCFG_V53_TCU_CLK1(_clk) \ + v53_base_device::set_clk1(*device, _clk); + +#define MCFG_V53_TCU_CLK2(_clk) \ + v53_base_device::set_clk2(*device, _clk); + +#define MCFG_V53_TCU_OUT0_HANDLER(_devcb) \ + devcb = &v53_base_device::set_out0_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_TCU_OUT1_HANDLER(_devcb) \ + devcb = &v53_base_device::set_out1_handler(*device, DEVCB_##_devcb); + +#define MCFG_V53_TCU_OUT2_HANDLER(_devcb) \ + devcb = &v53_base_device::set_out2_handler(*device, DEVCB_##_devcb); + + + class v53_base_device : public nec_common_device { public: @@ -44,7 +88,29 @@ public: UINT8 m_DULA; UINT8 m_OPHA; - // TMU + // TCU + + + // SCU + DECLARE_READ8_MEMBER(scu_simk_r); + DECLARE_WRITE8_MEMBER(scu_simk_w); + UINT8 m_simk; + template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(device).m_txd_handler.set_callback(object); } + template static devcb_base &set_dtr_handler(device_t &device, _Object object) { return downcast(device).m_dtr_handler.set_callback(object); } + template static devcb_base &set_rts_handler(device_t &device, _Object object) { return downcast(device).m_rts_handler.set_callback(object); } + template static devcb_base &set_rxrdy_handler(device_t &device, _Object object) { return downcast(device).m_rxrdy_handler.set_callback(object); } + template static devcb_base &set_txrdy_handler(device_t &device, _Object object) { return downcast(device).m_txrdy_handler.set_callback(object); } + template static devcb_base &set_txempty_handler(device_t &device, _Object object) { return downcast(device).m_txempty_handler.set_callback(object); } + template static devcb_base &set_syndet_handler(device_t &device, _Object object) { return downcast(device).m_syndet_handler.set_callback(object); } + DECLARE_WRITE_LINE_MEMBER(scu_txd_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_dtr_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_rts_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_rxrdy_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_txrdy_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_txempty_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(scu_syndet_trampoline_cb); + + // TCU DECLARE_READ8_MEMBER(tmu_tst0_r); DECLARE_WRITE8_MEMBER(tmu_tct0_w); DECLARE_READ8_MEMBER(tmu_tst1_r); @@ -52,17 +118,17 @@ public: DECLARE_READ8_MEMBER(tmu_tst2_r); DECLARE_WRITE8_MEMBER(tmu_tct2_w); DECLARE_WRITE8_MEMBER(tmu_tmd_w); +// static void set_clk0(device_t &device, double clk0) { downcast(device).m_clk0 = clk0; } +// static void set_clk1(device_t &device, double clk1) { downcast(device).m_clk1 = clk1; } +// static void set_clk2(device_t &device, double clk2) { downcast(device).m_clk2 = clk2; } + template static devcb_base &set_out0_handler(device_t &device, _Object object) { return downcast(device).m_out0_handler.set_callback(object); } + template static devcb_base &set_out1_handler(device_t &device, _Object object) { return downcast(device).m_out1_handler.set_callback(object); } + template static devcb_base &set_out2_handler(device_t &device, _Object object) { return downcast(device).m_out2_handler.set_callback(object); } + DECLARE_WRITE_LINE_MEMBER(tcu_out0_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(tcu_out1_trampoline_cb); + DECLARE_WRITE_LINE_MEMBER(tcu_out2_trampoline_cb); - // SCU - DECLARE_READ8_MEMBER(scu_srb_r); - DECLARE_WRITE8_MEMBER(scu_stb_w); - DECLARE_READ8_MEMBER(scu_sst_r); - DECLARE_WRITE8_MEMBER(scu_scm_w); - DECLARE_WRITE8_MEMBER(scu_smd_w); - DECLARE_READ8_MEMBER(scu_simk_r); - DECLARE_WRITE8_MEMBER(scu_simk_w); - - + void install_peripheral_io(); const address_space_config m_io_space_config; @@ -99,6 +165,23 @@ protected: virtual machine_config_constructor device_mconfig_additions() const; virtual void device_start(); virtual void device_reset(); + + // 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; + + // 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; };