diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2016-08-03 18:01:49 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2016-08-05 19:05:01 -0400 |
commit | da754c80782425a4c63d2da0a2635ca4fbaf16a5 (patch) | |
tree | 22e55dc4ec81a097a24346d2d735ad8348315933 /src/mame/includes/amiga.h | |
parent | 1317019974231191a0a42d732ef9b603dcd00896 (diff) |
Devfind revision phase 2 (nw)
- Eliminate read_safe as a global function and make it a method of optional_ioport (and required_ioport, for which it makes less sense).
- New constructor for optional_ioport_array and required_ioport_array using std::initializer_list to specify tag list
- Remove pointer/reference conversion operators for required_ioport and optional_ioport. Explicit getters like found() and target() are now required when dereferencing isn't wanted. Many drivers have been changed to use required_ioport_array and optional_ioport_array to make this cleaner.
- Update numerous drivers that were using read_safe to use I/O port finders generally. Port names have been kept the same as far as possible to avoid breaking saves.(Some of the optional finders should probably be required.)
- Give edfbl and monkelf their own memory maps so hacky input reading routines can be removed.
- Clean up some legacy static handlers in amiga.cpp and cubo.cpp.
Diffstat (limited to 'src/mame/includes/amiga.h')
-rw-r--r-- | src/mame/includes/amiga.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 03c9829da3d..c5f88a08c75 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -347,8 +347,7 @@ public: m_potgo_port(*this, "potgo"), m_pot0dat_port(*this, "POT0DAT"), m_pot1dat_port(*this, "POT1DAT"), - m_p1joy_port(*this, "p1_joy"), - m_p2joy_port(*this, "p2_joy"), + m_joy_ports(*this, {"p1_joy", "p2_joy"}), m_p1_mouse_x(*this, "p1_mouse_x"), m_p1_mouse_y(*this, "p1_mouse_y"), m_p2_mouse_x(*this, "p2_mouse_x"), @@ -576,8 +575,7 @@ protected: optional_ioport m_potgo_port; optional_ioport m_pot0dat_port; optional_ioport m_pot1dat_port; - optional_ioport m_p1joy_port; - optional_ioport m_p2joy_port; + optional_ioport_array<2> m_joy_ports; optional_ioport m_p1_mouse_x; optional_ioport m_p1_mouse_y; optional_ioport m_p2_mouse_x; |