From 13bbcd283640dbf2c60e6e1777445cc8b5bdcdc0 Mon Sep 17 00:00:00 2001 From: Joakim Larsson Edstrom Date: Sat, 12 Sep 2015 08:59:46 +0200 Subject: [PATCH] Added new devices to build --- scripts/src/machine.lua | 24 ++++++++++++++++++++++++ scripts/target/mame/mess.lua | 2 ++ src/emu/machine/z80scc.c | 19 ++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index d864e129b47..c89a11c63b4 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2364,6 +2364,30 @@ if (MACHINES["Z80DART"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/z80sio.h,MACHINES["Z80SIO"] = true +--------------------------------------------------- + +if (MACHINES["Z80SIO"]~=null) then + files { + MAME_DIR .. "src/devices/machine/z80sio.c", + MAME_DIR .. "src/devices/machine/z80sio.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/z80scc.h,MACHINES["Z80SCC"] = true +--------------------------------------------------- + +if (MACHINES["Z80SCC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/z80scc.c", + MAME_DIR .. "src/devices/machine/z80scc.h", + } +end + --------------------------------------------------- -- --@src/devices/machine/z80dma.h,MACHINES["Z80DMA"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 0d81b3892d2..40f47ccd23e 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -546,6 +546,8 @@ MACHINES["X76F100"] = true MACHINES["YM2148"] = true MACHINES["Z80CTC"] = true MACHINES["Z80DART"] = true +MACHINES["Z80SIO"] = true +MACHINES["Z80SCC"] = true MACHINES["Z80DMA"] = true MACHINES["Z80PIO"] = true MACHINES["Z80STI"] = true diff --git a/src/emu/machine/z80scc.c b/src/emu/machine/z80scc.c index d498df918fd..ed84814ae0d 100644 --- a/src/emu/machine/z80scc.c +++ b/src/emu/machine/z80scc.c @@ -558,9 +558,11 @@ z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, d : z80sio_channel( mconfig, tag, owner, clock) { // Reset all SCC specific registers; z80sio_channel:: manages the base registers - m_rr3 = m_rr4 = m_rr5 = m_rr6 = m_rr7 = m_rr8 = m_rr9 = - m_rr10 = m_rr11 = m_rr12 = m_rr13 = m_rr14 = m_rr15 = 0; - m_wr8 = m_wr9 = m_wr10 = m_wr11 = m_wr12 = m_wr13 = m_wr14 = m_wr15; + m_rr0 = m_rr1 = m_rr2 = + m_rr3 = m_rr4 = m_rr5 = m_rr6 = m_rr7 = m_rr8 = m_rr9 = + m_rr10 = m_rr11 = m_rr12 = m_rr13 = m_rr14 = m_rr15 = 0; + m_rr0 = m_rr1 = m_rr2 = m_rr3 = m_rr4 = m_rr5 = m_rr6 = m_rr7 = + m_wr8 = m_wr9 = m_wr10 = m_wr11 = m_wr12 = m_wr13 = m_wr14 = m_wr15; for (int i = 0; i < 3; i++) // TODO adapt to SCC fifos { @@ -584,6 +586,9 @@ void z80scc_channel::device_start() // state saving // m_rr0-m_rr2 is handled by the z80sio_channel driver, our base class + save_item(NAME(m_rr0)); + save_item(NAME(m_rr1)); + save_item(NAME(m_rr2)); save_item(NAME(m_rr3)); save_item(NAME(m_rr4)); save_item(NAME(m_rr5)); @@ -598,6 +603,14 @@ void z80scc_channel::device_start() save_item(NAME(m_rr14)); save_item(NAME(m_rr15)); // m_wr0-m_wr7 is handled by the z80sio_channel driver, our base class + save_item(NAME(m_wr0)); + save_item(NAME(m_wr1)); + save_item(NAME(m_wr2)); + save_item(NAME(m_wr3)); + save_item(NAME(m_wr4)); + save_item(NAME(m_wr5)); + save_item(NAME(m_wr6)); + save_item(NAME(m_wr7)); save_item(NAME(m_wr8)); save_item(NAME(m_wr9)); save_item(NAME(m_wr10));