diff options
author | Michael Zapf <Michael.Zapf@mizapf.de> | 2018-08-19 21:37:11 +0200 |
---|---|---|
committer | Michael Zapf <Michael.Zapf@mizapf.de> | 2018-08-19 21:37:11 +0200 |
commit | 88f1b0c21b22daf847fc6237b441f93619f58404 (patch) | |
tree | 298215da38ebb701c5868e69b5b117eb080eb410 /src/devices | |
parent | 7a2880f8ee32370db4521f482affbc777cabf865 (diff) |
ti99: Minor config changes, simplified ti99 config, use new cassette output.
Diffstat (limited to 'src/devices')
-rw-r--r-- | src/devices/bus/ti99/internal/ioport.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/ti99/internal/ioport.h | 8 | ||||
-rw-r--r-- | src/devices/bus/ti99/joyport/joyport.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/ti99/joyport/joyport.h | 9 | ||||
-rw-r--r-- | src/devices/bus/ti99/peb/spchsyn.cpp | 1 |
5 files changed, 20 insertions, 8 deletions
diff --git a/src/devices/bus/ti99/internal/ioport.cpp b/src/devices/bus/ti99/internal/ioport.cpp index f35f36f47f0..f3984425a66 100644 --- a/src/devices/bus/ti99/internal/ioport.cpp +++ b/src/devices/bus/ti99/internal/ioport.cpp @@ -165,10 +165,10 @@ WRITE_LINE_MEMBER(ioport_attached_device::set_ready) m_ioport->m_console_ready(state); } -void ioport_device::configure_slot(bool withevpc) +void ioport_device::configure_slot(int flags) { option_reset(); - if (withevpc) + if ((flags & WITH_PEB_AND_EVPC)!=0) { option_add("peb", TI99_PERIBOX_EV); set_default_option("peb"); diff --git a/src/devices/bus/ti99/internal/ioport.h b/src/devices/bus/ti99/internal/ioport.h index 0cfac6a9419..1bca7d53a29 100644 --- a/src/devices/bus/ti99/internal/ioport.h +++ b/src/devices/bus/ti99/internal/ioport.h @@ -52,6 +52,12 @@ private: I/O port ********************************************************************/ +enum +{ + PLAIN=0, + WITH_PEB_AND_EVPC +}; + class ioport_device : public device_t, public device_slot_interface { friend class ioport_attached_device; @@ -73,7 +79,7 @@ public: auto extint_cb() { return m_console_extint.bind(); } auto ready_cb() { return m_console_ready.bind(); } - void configure_slot(bool withevpc); + void configure_slot(int flags); protected: void device_start() override; diff --git a/src/devices/bus/ti99/joyport/joyport.cpp b/src/devices/bus/ti99/joyport/joyport.cpp index 15f4bb9c4f8..536b618eb6b 100644 --- a/src/devices/bus/ti99/joyport/joyport.cpp +++ b/src/devices/bus/ti99/joyport/joyport.cpp @@ -95,12 +95,12 @@ void joyport_device::device_config_complete() m_connected = dynamic_cast<device_ti99_joyport_interface*>(subdevices().first()); } -void joyport_device::configure_slot(bool withmouse, bool withhandset) +void joyport_device::configure_slot(int flags) { option_reset(); option_add("twinjoy", TI99_JOYSTICK); - if (withmouse) option_add("mecmouse", TI99_MECMOUSE); - if (withhandset) option_add("handset", TI99_HANDSET); + if ((flags & MOUSE)!=0) option_add("mecmouse", TI99_MECMOUSE); + if ((flags & HANDSET)!=0) option_add("handset", TI99_HANDSET); set_default_option("twinjoy"); set_fixed(false); } diff --git a/src/devices/bus/ti99/joyport/joyport.h b/src/devices/bus/ti99/joyport/joyport.h index 8f6a8a06572..c67ebd74d74 100644 --- a/src/devices/bus/ti99/joyport/joyport.h +++ b/src/devices/bus/ti99/joyport/joyport.h @@ -24,6 +24,13 @@ namespace bus { namespace ti99 { namespace joyport { +enum +{ + PLAIN=0, + MOUSE, + HANDSET +}; + class joyport_device; /******************************************************************** @@ -55,7 +62,7 @@ public: void set_interrupt(int state); void pulse_clock(); auto int_cb() { return m_interrupt.bind(); } - void configure_slot(bool withmouse, bool withhandset); + void configure_slot(int flags); protected: void device_start() override; diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index 1ba1477a690..233f8d58e4d 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -25,7 +25,6 @@ #include "spchsyn.h" #include "machine/spchrom.h" -#include "sound/wave.h" #include "speaker.h" #define LOG_WARN (1U<<1) // Warnings |