diff options
author | 2020-09-14 23:42:43 -0400 | |
---|---|---|
committer | 2020-09-14 23:42:58 -0400 | |
commit | ffbba47c4f5058c54e758a539d64943b7006c676 (patch) | |
tree | 2db2c99cbecd4572c8ab2af14a48133accaeb67d /src | |
parent | 7e121d68bb443f579da3271e43255d69925d71a3 (diff) |
kl5c80a12, kl5c80a16: Actually add timers to configuration (files overlooked in 7e121d68bb443f579da3271e43255d69925d71a3)
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/cpu/z80/kl5c80a12.cpp | 9 | ||||
-rw-r--r-- | src/devices/cpu/z80/kl5c80a16.cpp | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp index dd7bd6060a6..7f79c37dec9 100644 --- a/src/devices/cpu/z80/kl5c80a12.cpp +++ b/src/devices/cpu/z80/kl5c80a12.cpp @@ -12,7 +12,7 @@ Important functional blocks: — MMU — USART (KP51) (unemulated) - — 16-bit timer/counters (KP64, KP63) (unemulated) + — 16-bit timer/counters (KP64, KP63) (KP64 unemulated) — 16-level interrupt controller (KP69) — Parallel ports (KP65, KP66) (unemulated) — 512-byte high-speed RAM @@ -22,6 +22,7 @@ #include "emu.h" #include "kl5c80a12.h" +#include "kp63.h" // device type definition DEFINE_DEVICE_TYPE(KL5C80A12, kl5c80a12_device, "kl5c80a12", "Kawasaki Steel KL5C80A12") @@ -59,6 +60,7 @@ void kl5c80a12_device::internal_ram(address_map &map) void kl5c80a12_device::internal_io(address_map &map) { map(0x00, 0x07).mirror(0xff00).rw(FUNC(kl5c80a12_device::mmu_r), FUNC(kl5c80a12_device::mmu_w)); + map(0x20, 0x25).mirror(0xff00).rw("timerb", FUNC(kp63_3channel_device::read), FUNC(kp63_3channel_device::write)); map(0x34, 0x34).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrl_r), FUNC(kp69_device::lerl_pgrl_w)); map(0x35, 0x35).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrh_r), FUNC(kp69_device::lerh_pgrh_w)); map(0x36, 0x36).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrl_r), FUNC(kp69_device::imrl_w)); @@ -97,6 +99,11 @@ void kl5c80a12_device::device_add_mconfig(machine_config &config) { KP69(config, m_kp69); m_kp69->int_callback().set_inputline(*this, INPUT_LINE_IRQ0); + + kp63_3channel_device &timerb(KP63_3CHANNEL(config, "timerb", DERIVED_CLOCK(1, 2))); + timerb.outs_callback<0>().set(m_kp69, FUNC(kp69_device::ir_w<13>)); + timerb.outs_callback<1>().set(m_kp69, FUNC(kp69_device::ir_w<14>)); + timerb.outs_callback<2>().set(m_kp69, FUNC(kp69_device::ir_w<15>)); } diff --git a/src/devices/cpu/z80/kl5c80a16.cpp b/src/devices/cpu/z80/kl5c80a16.cpp index 6328a7322f4..8fa31925366 100644 --- a/src/devices/cpu/z80/kl5c80a16.cpp +++ b/src/devices/cpu/z80/kl5c80a16.cpp @@ -9,7 +9,7 @@ — DMA controller (KP27) (unemulated) — UART (KP61) (unemulated) — Synchronous serial port (KP62) (unemulated) - — 16-bit timer/counters (KP63A) (unemulated) + — 16-bit timer/counters (KP63A) — 16-level interrupt controller (KP69) — Parallel ports (KP67) (unemulated) — External bus/DRAM interface unit (unemulated) @@ -18,6 +18,7 @@ #include "emu.h" #include "kl5c80a16.h" +#include "kp63.h" // device type definition DEFINE_DEVICE_TYPE(KL5C80A16, kl5c80a16_device, "kl5c80a16", "Kawasaki Steel KL5C80A16") @@ -45,6 +46,7 @@ kl5c80a16_device::kl5c80a16_device(const machine_config &mconfig, const char *ta void kl5c80a16_device::internal_io(address_map &map) { map(0x00, 0x07).mirror(0xff00).rw(FUNC(kl5c80a16_device::mmu_r), FUNC(kl5c80a16_device::mmu_w)); + map(0x20, 0x27).mirror(0xff00).rw("timer", FUNC(kp63a_device::read), FUNC(kp63a_device::write)); map(0x34, 0x34).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrl_r), FUNC(kp69_device::lerl_pgrl_w)); map(0x35, 0x35).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrh_r), FUNC(kp69_device::lerh_pgrh_w)); map(0x36, 0x36).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrl_r), FUNC(kp69_device::imrl_w)); @@ -83,6 +85,12 @@ void kl5c80a16_device::device_add_mconfig(machine_config &config) { KP69(config, m_kp69); m_kp69->int_callback().set_inputline(*this, INPUT_LINE_IRQ0); + + kp63a_device &timer(KP63A(config, "timer", DERIVED_CLOCK(1, 2))); + timer.outs_callback<0>().set(m_kp69, FUNC(kp69_device::ir_w<12>)); + timer.outs_callback<1>().set(m_kp69, FUNC(kp69_device::ir_w<13>)); + //timer.outs_callback<2>().set(m_kp69, FUNC(kp69_device::ir_w<0>)); // TODO: multiplexed with P20 input by SCR1 bit 4 + //timer.outs_callback<3>().set(m_kp69, FUNC(kp69_device::ir_w<1>)); // TODO: multiplexed with P21 input by SCR1 bit 5 (may also be NMI) } |