From 98bc1d04225646d38f38a2d498a9343c087b9944 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 31 Dec 2017 21:17:46 -0500 Subject: [PATCH] hk68v10: Add Z8536 CIO (nw) z8536: Don't return to state 0 after a software-programmed reset (nw) --- src/devices/machine/z8536.cpp | 3 ++- src/mame/drivers/hk68v10.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp index 7021335e767..d8581e04101 100644 --- a/src/devices/machine/z8536.cpp +++ b/src/devices/machine/z8536.cpp @@ -1054,7 +1054,8 @@ WRITE8_MEMBER( z8536_device::write ) case STATE_1: write_register(m_pointer, data); - m_state = STATE_0; + if (m_state != STATE_RESET) + m_state = STATE_0; } break; } diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 064fee8040e..9fee60dcb45 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -168,6 +168,7 @@ #include "cpu/m68000/m68000.h" #include "bus/vme/vme.h" #include "machine/z80scc.h" +#include "machine/z8536.h" #include "bus/rs232/rs232.h" #include "machine/clock.h" @@ -226,7 +227,7 @@ AM_RANGE (0x000000, 0x000007) AM_RAM AM_WRITE (bootvect_w) /* After first AM_RANGE (0x000008, 0x1fffff) AM_RAM /* 2 Mb RAM */ AM_RANGE (0xFC0000, 0xFC3fff) AM_ROM /* System EPROM Area 16Kb HBUG */ AM_RANGE (0xFC4000, 0xFDffff) AM_ROM /* System EPROM Area an additional 112Kb for System ROM */ -AM_RANGE (0xFE9000, 0xFE9009) AM_RAM //AM_DEVREADWRITE8("scc", scc8530_device, ba_cd_r, ba_cd_w, 0xffff) /* Z80-PIO? */ +AM_RANGE (0xFE9000, 0xFE9007) AM_DEVREADWRITE8("cio", z8536_device, read, write, 0xff00) AM_RANGE (0xFEA000, 0xFEA001) AM_DEVREADWRITE8("scc", scc8530_device, ca_r, ca_w, 0xff00) /* Dual serial port Z80-SCC */ AM_RANGE (0xFEA002, 0xFEA003) AM_DEVREADWRITE8("scc", scc8530_device, cb_r, cb_w, 0xff00) /* Dual serial port Z80-SCC */ AM_RANGE (0xFEA004, 0xFEA005) AM_DEVREADWRITE8("scc", scc8530_device, da_r, da_w, 0xff00) /* Dual serial port Z80-SCC */ @@ -337,6 +338,8 @@ static MACHINE_CONFIG_START (hk68v10) MCFG_CPU_ADD ("maincpu", M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (hk68v10_mem) + MCFG_DEVICE_ADD("cio", Z8536, SCC_CLOCK) + /* Terminal Port config */ MCFG_SCC8530_ADD("scc", SCC_CLOCK, 0, 0, 0, 0 ) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_txd))