diff options
author | 2017-05-23 14:58:36 +1000 | |
---|---|---|
committer | 2017-05-23 15:01:11 +1000 | |
commit | 96c9112785e158a267443831fe9f3fa857d60b14 (patch) | |
tree | 5f027f0db703571fce112e5d695553c5ea6dac69 /src/emu/inputdev.cpp | |
parent | 6e04e04b46fae6c0c09dd1d0603d585039a93889 (diff) |
general cleanup:
* move rarely-used output and pty interfaces out of emu.h
* consolidate and de-duplicate forward declarations, also remove some obsolete ones
* clean up more #include guard macros
* scope down a few more things
(nw) Everyone, please keep forward declarations for src/emu in src/emu/emufwd.h -
this will make it far easier to keep them in sync with declarations than having
them scattered through all the other files.
Diffstat (limited to 'src/emu/inputdev.cpp')
-rw-r--r-- | src/emu/inputdev.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/emu/inputdev.cpp b/src/emu/inputdev.cpp index 380b42d9c3a..62aa1428b21 100644 --- a/src/emu/inputdev.cpp +++ b/src/emu/inputdev.cpp @@ -9,9 +9,10 @@ ***************************************************************************/ #include "emu.h" -#include "emuopts.h" #include "inputdev.h" +#include "emuopts.h" + //************************************************************************** // TYPE DEFINITIONS @@ -276,7 +277,7 @@ input_device::~input_device() input_item_id input_device::add_item(const char *name, input_item_id itemid, item_get_state_func getstate, void *internal) { - assert_always(machine().phase() == MACHINE_PHASE_INIT, "Can only call input_device::add_item at init time!"); + assert_always(machine().phase() == machine_phase::INIT, "Can only call input_device::add_item at init time!"); assert(name != nullptr); assert(itemid > ITEM_ID_INVALID && itemid < ITEM_ID_MAXIMUM); assert(getstate != nullptr); @@ -493,7 +494,7 @@ input_class::~input_class() input_device *input_class::add_device(const char *name, const char *id, void *internal) { - assert_always(machine().phase() == MACHINE_PHASE_INIT, "Can only call input_class::add_device at init time!"); + assert_always(machine().phase() == machine_phase::INIT, "Can only call input_class::add_device at init time!"); assert(name != nullptr); assert(id != nullptr); |