Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix up input_merger - it needs to save, and it's passive so no reset

Browse Source
This commit is contained in:
Vas Crabb 2017-08-02 17:37:24 +10:00
parent ff27668eac
commit bcef3c0445
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/machine/input_merger.cpp
View File

@ -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);
}

4
src/devices/machine/input_merger.h
View File

@ -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;