summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-08-02 17:37:24 +1000
committer Vas Crabb <vas@vastheman.com>2017-08-02 17:37:24 +1000
commitbcef3c04451c7e8884691bcb99eb129c5073e4c8 (patch)
tree163843f25a87aed601ea6bf4a53b117871d031ca
parentff27668eac522f8c89f351f4e4b72b7523c5d033 (diff)
fix up input_merger - it needs to save, and it's passive so no reset
-rw-r--r--src/devices/machine/input_merger.cpp11
-rw-r--r--src/devices/machine/input_merger.h4
2 files changed, 9 insertions, 6 deletions
diff --git a/src/devices/machine/input_merger.cpp b/src/devices/machine/input_merger.cpp
index 834795f948b..d69b2aa9eae 100644
--- a/src/devices/machine/input_merger.cpp
+++ b/src/devices/machine/input_merger.cpp
@@ -53,6 +53,7 @@ input_merger_device::~input_merger_device()
void input_merger_device::device_start()
{
m_output_handler.resolve_safe();
+ save_item(NAME(m_state));
}
@@ -70,11 +71,12 @@ input_merger_active_high_device::input_merger_active_high_device(machine_config
}
//-------------------------------------------------
-// device_reset - device-specific reset
+// device_start - device-specific startup
//-------------------------------------------------
-void input_merger_active_high_device::device_reset()
+void input_merger_active_high_device::device_start()
{
+ input_merger_device::device_start();
std::fill(std::begin(m_state), std::end(m_state), false);
}
@@ -103,11 +105,12 @@ input_merger_active_low_device::input_merger_active_low_device(machine_config co
}
//-------------------------------------------------
-// device_reset - device-specific reset
+// device_start - device-specific startup
//-------------------------------------------------
-void input_merger_active_low_device::device_reset()
+void input_merger_active_low_device::device_start()
{
+ input_merger_device::device_start();
std::fill(std::begin(m_state), std::end(m_state), true);
}
diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h
index 0d5cb6801e2..2668a8d8dbb 100644
--- a/src/devices/machine/input_merger.h
+++ b/src/devices/machine/input_merger.h
@@ -76,7 +76,7 @@ public:
protected:
// device-level overrides
- virtual void device_reset() override;
+ virtual void device_start() override;
// input_merger device overrides
virtual void update_state() override;
@@ -91,7 +91,7 @@ public:
protected:
// device-level overrides
- virtual void device_reset() override;
+ virtual void device_start() override;
// input_merger device overrides
virtual void update_state() override;